From nobody Mon Jun 13 17:36:11 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 4D6CA8355CC; Mon, 13 Jun 2022 17:36:12 +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 4LMJdR5x9Lz4tSd; Mon, 13 Jun 2022 17:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141772; 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=Tdy/gKUKFYyURSAt4rKWTQ+DRUtKF9gZ5mEl/P+tGFQ=; b=lpQu6UXWZ8LZJRB6Tkkq2w2GOJqLGSSl839/S2WDWe7dwkSRuHVdhjISipkx3ENFI/s6Tm w2JSR+19eC70go3OyX+P79pm6n9cUr2oiSxh3LFeQ2N/1cyPWF6oBTnK1nqGXEGwPeNExr KboX7soGRhTyVbYEEExO35Fy8M0ZkNkVU9RQEVSwTAAS2FufPVa35g75mdFHYx2+5ktPKA PVW/oQyGtE2dn/iULMahB5ZMWKKPoVRSvezgXFJmNd6VkZHA8DbQftk+kE2FP99f4AdF65 rqrRvD9thl5KyyfE7w3VPmadS7VU8AH4tFqcXR7zIueMOvPOC6U4i4iqw6Hnug== 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 5BFF51A138; Mon, 13 Jun 2022 17:36:11 +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 25DHaBc9061472; Mon, 13 Jun 2022 17:36:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DHaBem061471; Mon, 13 Jun 2022 17:36:11 GMT (envelope-from git) Date: Mon, 13 Jun 2022 17:36:11 GMT Message-Id: <202206131736.25DHaBem061471@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: 9f7588dd93e5 - main - amd64: -m32 support for machine/pcpu_aux.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: 9f7588dd93e55b7b361c949dd91da8aba9d99ac1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141772; 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=Tdy/gKUKFYyURSAt4rKWTQ+DRUtKF9gZ5mEl/P+tGFQ=; b=ly2rdMDw+65YH29U6MScwTHw5oHfGyQxdsrxdojLmUkPqV+DCtpRioEs2sC8YyvaWptAGp yWb4tuNFlkNTvnZkBp0r/KYC23GKBaUXB4dRNAhMyrHehAuNFiwcC4GaZQidqNAWfaPAvY 70gwXujhmXgAV5WqR3cpm4cSWv1BoU4tYemY6LtZteHAfw34leQCwizFFcpKhjUKvlRS+J mC00lIawWAexN6aOVn2WZl0Ja2RSb0RjBCn7V55QZaAe8bAUhM17rWCzpcQOuDdP9t32a1 uzaoKVpPJv10RCPk5BzfGcduCsgkjze0vUHuJQwlEuCuW9bBp251Z1juvRev0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655141772; a=rsa-sha256; cv=none; b=FbcXzJsugsVj0XSD6hjgjlJ1IjHPntrHO+ZtNdLDa9mv3IgGJ2Ysrc+5kbV/KuPwKKdgQ2 aOJWR1HY9A/Bzv6DMKIkcnvpNXGPv8cm2LyXMrpFWgm0PXGi8cBSvX34X0a3OyA6d+VeSy Mx+m7YuWl3C36Y6+q9OVhQvb465xG/umA2B3EMk+Ga/SCqSCecWofp078b0S2XUND0Gpmm wYNlCREFfxOu05z6+tJhJZGuzfGhrW4i/biJZt6u3TqlOIrTXLVF3CgCD4lqiG1LzjlVw5 Zk0FE2ydBgl6fqQLVHjoI0bULw/KOXUByC9F03gDTVBad2302uD9nmpxRaeTBg== 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=9f7588dd93e55b7b361c949dd91da8aba9d99ac1 commit 9f7588dd93e55b7b361c949dd91da8aba9d99ac1 Author: Brooks Davis AuthorDate: 2022-06-13 17:35:40 +0000 Commit: Brooks Davis CommitDate: 2022-06-13 17:35:40 +0000 amd64: -m32 support for machine/pcpu_aux.h Install the i386 pcpu_aux.h under /usr/include/i386 on amd64 and include when targeting i386. This is a kernel-only header that is required by procstat's ZFS support. Reviewed by: jhb, imp --- include/i386/Makefile | 3 ++- sys/amd64/include/pcpu_aux.h | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/i386/Makefile b/include/i386/Makefile index 70d825bab9cf..de270655fb69 100644 --- a/include/i386/Makefile +++ b/include/i386/Makefile @@ -14,7 +14,8 @@ INCS= \ # These kernel-only headers are used by procstat's ZFS support. # This should be fixed. INCS+= \ - pcpu.h + pcpu.h \ + pcpu_aux.h INCSDIR= ${INCLUDEDIR}/i386 .include diff --git a/sys/amd64/include/pcpu_aux.h b/sys/amd64/include/pcpu_aux.h index 50dfa30fbf5b..229952fb459b 100644 --- a/sys/amd64/include/pcpu_aux.h +++ b/sys/amd64/include/pcpu_aux.h @@ -30,6 +30,10 @@ * $FreeBSD$ */ +#ifdef __i386__ +#include +#else /* !__i386__ */ + #ifndef _MACHINE_PCPU_AUX_H_ #define _MACHINE_PCPU_AUX_H_ @@ -60,3 +64,5 @@ __curthread(void) #define curpcb (&curthread->td_md.md_pcb) #endif /* _MACHINE_PCPU_AUX_H_ */ + +#endif /* __i386__ */