From nobody Mon Jun 13 17:36:10 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 1022C83526B; Mon, 13 Jun 2022 17:36:11 +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 4LMJdQ2gJQz4tc0; Mon, 13 Jun 2022 17:36:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141770; 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=JUa+umZ0XHB0rFHHfVSso0ag5jPDBM2cAilVKK+jjLQ=; b=QpRhycIV3p4ur0hEM0ThNsXCAD+9hw1kYoWjlK557mBIR6kqsD/4TpmU3IPHGh0hyV7lkv vEL13C3fnm4gMtyDHC1O24PHTv6yi8ejhPClnINiBy0MitQlPuLDwxQiRR+AwwNY6gAxDX zhGwJDxSWZdWiGOjOLYRFWNGWIrcwRp3/bATNOaef6BusGH8QwQKVSvmjj4WJ2BiC5JwUD 8hquNl0pkpJDnTGEBrXB/Yv0qE9/SmpxsMi/JqcX3SiSkqfLMoG9iKVLX5yCjB0iRYJRU7 4vJ+WrYZfeFKSsFh1n/9pKxVQEqAW9slcOwNmW22k3uzd8BcXDimRHUyLhoT0Q== 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 3836F1A326; Mon, 13 Jun 2022 17:36:10 +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 25DHaA9H061448; Mon, 13 Jun 2022 17:36:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DHaAKT061447; Mon, 13 Jun 2022 17:36:10 GMT (envelope-from git) Date: Mon, 13 Jun 2022 17:36:10 GMT Message-Id: <202206131736.25DHaAKT061447@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: f6fada5eed38 - main - amd64: -m32 support for machine/pcpu.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: f6fada5eed38a8ee2338c1747b9fef587c3ae3da Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141770; 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=JUa+umZ0XHB0rFHHfVSso0ag5jPDBM2cAilVKK+jjLQ=; b=cVgvTnv43CUNDFItpDLNUHqbaiKgX3wKj24R9s5f/6ZyiAjId1SaG6qqbjA2UnsvTh/gtw 3mUIsrpa67/AjdE1ZLRqX+wNRYgo5xpEhf+1olVtoQQSsjPMPyB7FW2wb0SA/zQCzSh894 EaTBsOA9oAh0BCWOjBg3/d2gfIgVI3cWbUw5Y4se7+NrfvnaVKQkH1q9Eq32Oej1hmCkob J5BgdL6Of7zw1lPAhtlXcFqWxKZ3tFIQkeub4+Wdeqpm5R+9xfh4lGec3VBdbJppIEA1w1 +nodAI0AVMJcZ8X509aQ6S9zszSSYwuBGNavYmX7SJH8/JCJlPgEkWgoYm+GwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655141770; a=rsa-sha256; cv=none; b=v7LLIffZ2uklRAziRj68hwblKq00Cm8+9LkrhSXuzpc2TUV19zMN51J6/h/n7bm1TqR+w5 PPnik9+gvqmx4vVFVwVaxztH/aUmfPfIe3xLJRVZ9fUSsAlPGxdSBuZ3ltVVHX5kbMGkGZ GOEgz23Hkfyzt+4eFnHQ1dCm5ZrjEINRg0MaOpYFEmZLSx89QGtbJcs3N3uHMvBbq3LQt0 g+uT2IZZvLhV0To9lsb7PhDOjq9DJ8PPDFRQDqj/AbLFh0LeEkXYxA+eYe/5TqwTlykNWX o4x8yCEVi/z4y8jockZpLSTl6LKC/AJxP45/Qi8e0MHXpJHT+5//rPd4zlVfZw== 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=f6fada5eed38a8ee2338c1747b9fef587c3ae3da commit f6fada5eed38a8ee2338c1747b9fef587c3ae3da 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.h Install the i386 pcpu.h under /usr/include/i386 on amd64 and include when targeting i386. This is a kernel-only header and should not be required, but procstat's zfs support includes this with _KERNEL defined. Reviewed by: jhb, imp --- include/i386/Makefile | 4 ++++ sys/amd64/include/pcpu.h | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/include/i386/Makefile b/include/i386/Makefile index 5bc1a13033e5..70d825bab9cf 100644 --- a/include/i386/Makefile +++ b/include/i386/Makefile @@ -11,6 +11,10 @@ INCS= \ profile.h \ segments.h \ vmparam.h +# These kernel-only headers are used by procstat's ZFS support. +# This should be fixed. +INCS+= \ + pcpu.h INCSDIR= ${INCLUDEDIR}/i386 .include diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h index a671f01dbad5..8dcf51cc71c6 100644 --- a/sys/amd64/include/pcpu.h +++ b/sys/amd64/include/pcpu.h @@ -28,6 +28,10 @@ * $FreeBSD$ */ +#ifdef __i386__ +#include +#else /* !__i386__ */ + #ifndef _MACHINE_PCPU_H_ #define _MACHINE_PCPU_H_ @@ -274,3 +278,5 @@ _Static_assert(sizeof(struct monitorbuf) == 128, "2x cache line"); #endif /* _KERNEL */ #endif /* !_MACHINE_PCPU_H_ */ + +#endif /* __i386__ */