From nobody Mon Jun 13 17:36:05 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D4DE2834F34; Mon, 13 Jun 2022 17:36:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LMJdK6kS6z4tYk; Mon, 13 Jun 2022 17:36:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p/mEkZcuFFEXCn9CmLjN0FgVHQqLWMwYS7mDvi13r2I=; b=L7cbToDMZBVNGJZdoy231Bq7IVQHFWqtUaqISQhRguMxpEfLm717nV9+Ix4ZeXv+LcBrGw m7ATrOhvy9pieNedjGMTCzQvOJOeb8a3A+Is0nJA7vmFKnr1RNOR676wA8KWSl1re5kXg7 WCaY7mhV7aBW2INnIL+fCpZOca1QzDhVXJy8EZzQYiWcn2R6JWnVf45OmZOO1lwrJfdkeq Tc0CEo8JrtciELVBsgwNP0axtgW+NiRhtzONb8CWxDqoJNDWPTwZGQLmaI3j6Ress1YxTz Do8PtZks5hy9o17Fw5M0lNam4VF9TtM7lJ30b4zSGy5q2zHydpA0fSsQLbhQAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 94A941A324; Mon, 13 Jun 2022 17:36:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25DHa5Bt061346; Mon, 13 Jun 2022 17:36:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DHa57d061345; Mon, 13 Jun 2022 17:36:05 GMT (envelope-from git) Date: Mon, 13 Jun 2022 17:36:05 GMT Message-Id: <202206131736.25DHa57d061345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 3cd1b382c664 - main - amd64: -m32 support for machine/pmap.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cd1b382c6641f7e04e243dec46ee71744c7630e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p/mEkZcuFFEXCn9CmLjN0FgVHQqLWMwYS7mDvi13r2I=; b=xa/j5KqPRzgwBYpdFMnhnGLpe//EMnrLdD74ZRx+5hyvwahW9YCz8Nqg/ZPNGskhJOll7v OXf2SVvIypCLwYUgb+DOLWaZfifIxh82ZdbAuPLZMjEUfm6JolYcfoJKaDVA+Mjo5YPa2b y9YgtNxsDKnXrmMZB0KhzT+v9acQ/r4XGm4zJSvzg6nqDfESrZL1PhIfkVJbv3CwnVz5zs C5ULrMmJpJlkj7zv5fV0VEQb7GZK+SfnwRl/JV3bDwTFyTJxebXUugF+qNHpX5v+lAtD5U fyyngGZqdGQwLwwh5j7IxkXDFSTmVE56JoPAoomPa9zJOK1Kvv7/t4oWXqG57w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655141766; a=rsa-sha256; cv=none; b=EUWGbma4tsZ4RHVJ4mtxj7v5mzWlmAW/UlSiYZX3kHBbExuAZXSv6mipvfB/sWzuiO34l7 oI/CZQ60v4d91GXI6k3Fxf+0bKjoeyvzTpjWoOGKQAM6HwyjVPi55/iOB7NWDbeaK1BVYy X/YwPUGuHHCXZDDGoQxnOooGK2pgu842iDyx8W72QCvm6J59w9E0iYunuM6bNyA8wV+CrJ OBchHqcme8LZpVFf7dGg4C6b65H6qgBN5rz/7oz8Cpjhw9fZBoWGKVzqp3uIBKI2l/vPGP JwZMt1dTvuTTGz6BwIUO0oaoTxOTVj1ssclARsw4dN1hG/I03XWK1f/dMIcDmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=3cd1b382c6641f7e04e243dec46ee71744c7630e commit 3cd1b382c6641f7e04e243dec46ee71744c7630e Author: Brooks Davis AuthorDate: 2022-06-13 17:35:39 +0000 Commit: Brooks Davis CommitDate: 2022-06-13 17:35:39 +0000 amd64: -m32 support for machine/pmap.h Install the i386 pmap.h under /usr/include/i386 on amd64 and include when targeting i386. Reviewed by: jhb, imp --- include/i386/Makefile | 1 + sys/amd64/include/pmap.h | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/include/i386/Makefile b/include/i386/Makefile index e7eb0dd0c2eb..9f6ab9b47766 100644 --- a/include/i386/Makefile +++ b/include/i386/Makefile @@ -6,6 +6,7 @@ INCS= \ asmacros.h \ atomic.h \ cpufunc.h \ + pmap.h \ profile.h \ segments.h INCSDIR= ${INCLUDEDIR}/i386 diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h index 318e70e7794c..9aacae73ebd4 100644 --- a/sys/amd64/include/pmap.h +++ b/sys/amd64/include/pmap.h @@ -44,6 +44,10 @@ * $FreeBSD$ */ +#ifdef __i386__ +#include +#else /* !__i386__ */ + #ifndef _MACHINE_PMAP_H_ #define _MACHINE_PMAP_H_ @@ -584,3 +588,5 @@ pmap_pml5e_index(vm_offset_t va) #endif /* !LOCORE */ #endif /* !_MACHINE_PMAP_H_ */ + +#endif /* __i386__ */