From nobody Mon Jun 13 17:36:08 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 9B38383529B; Mon, 13 Jun 2022 17:36:09 +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 4LMJdP23Cfz4tgc; Mon, 13 Jun 2022 17:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141769; 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=tzd3dK7okFHyo3qomBqugRi7VGmsQH0NMgyOk2mnd58=; b=tlCL96d5iafJXbsJVa7d6dSiQiA/cFUlpBvPRUpErEWJ+lDw/zoWFzEIZavuUpXHybhgAn 85CUmrMtT3mFPYXK8JixjEo5FkDQP3z4VzhzLWto0ONRuFRoQE0uIHny/Ho4QPUF/yQieX ZpljCocqQoBNyI5K+ErZd5Df7acBNft9+Me4LmNmPpMPgthlXXQjnDsT1P7gR2VZ4KKwLG ypSgZ3pNYNDtSWQlxOP/IvyVScv+sjezh7/earXIO+Sy1zEoIqZRRqvBnm8U7ENBW4BehI g/Qew7daRp91AqITBpNOcKqHNDXPRhflJBqt2dK9hCXC1YUmBxyBxvCEuUXAxw== 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 0EB4B1A2D7; Mon, 13 Jun 2022 17:36:09 +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 25DHa8xP061424; Mon, 13 Jun 2022 17:36:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DHa8NJ061423; Mon, 13 Jun 2022 17:36:08 GMT (envelope-from git) Date: Mon, 13 Jun 2022 17:36:08 GMT Message-Id: <202206131736.25DHa8NJ061423@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: a29263b65651 - main - amd64: -m32 support for machine/sb_buf.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: a29263b6565145c3596356dce2e743ae13461fa7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141769; 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=tzd3dK7okFHyo3qomBqugRi7VGmsQH0NMgyOk2mnd58=; b=K50O/4CVg5gTNQlQA6JCN0PF1iOiBGGLyZVSC74haftF58AFLJ+RRAM/g4qTULU53AxUKI W2ndOEXUS1UkXn67u3O4ENXABUj2rf0cdOg76lrYIROLdbaDvufjS1pfin14lKSRtQ6EOX T6Ew7u+QcjfgYLk4TgTjZhCEeSBpKdxmuE+anr8xay9kx6GL7l0c0e22okNZnEETHqcKJb 3CdMkyjOg0T9+fDbvIxTmR4joMyrvyo7kMV3s4SeeWrBdR55lYLhePZBOsM32oDa/7+y9V BgZdU/yn94VqFJusKRfaTRIOfmpvaPnAsu2EnIL1dDF4dmqUKAfS/IUAdWdVeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655141769; a=rsa-sha256; cv=none; b=inOfIaHV4YmPINaPHhAbOyX8PXZLYK/LWRyd6OCu2aOwrTkBa0jjIxmCinMpnCT9xvTxhE aeTtI6h4tSQAHEVoNYpqE8pHIewsGfA8xFVwRkzfiWvwpMAA3V04OKM5YJKpmMSmCw79YZ nl0IRYlsVJsb6qvAtQzFMqdDiPXcDIAFE+mg9EVeApt7OBrd2k6a4o6LhVFXc3/4spKI81 CosFKG+PKx9nU76Uu0DXrZePu2YWt/LiYWyFUNcj0hJjc2oXFfNdUjLOtf2gBet1pRjS2a vC604ay8wSCn1vokAYMvq5MLROtY6vR0CKV0SyK3rvB3xmGw3uD+fIP+yxhtfA== 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=a29263b6565145c3596356dce2e743ae13461fa7 commit a29263b6565145c3596356dce2e743ae13461fa7 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/sb_buf.h The contents of the amd64 version are kernel-only and incompatible with other headers when compiled for i386 userspace with _KERNEL defined. Just ifdef the whole file out in that case rather than giving this file the full x86 treatment since it's not needed for current use cases (procstat zfs support). Reviewed by: jhb, imp --- sys/amd64/include/sf_buf.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/amd64/include/sf_buf.h b/sys/amd64/include/sf_buf.h index 216dfe8d411b..f689859dcbb8 100644 --- a/sys/amd64/include/sf_buf.h +++ b/sys/amd64/include/sf_buf.h @@ -31,6 +31,7 @@ #ifndef _MACHINE_SF_BUF_H_ #define _MACHINE_SF_BUF_H_ +#ifdef __amd64__ /* * On this machine, the only purpose for which sf_buf is used is to implement * an opaque pointer required by the machine-independent parts of the kernel. @@ -50,4 +51,5 @@ sf_buf_page(struct sf_buf *sf) return ((vm_page_t)sf); } +#endif /* __amd64__ */ #endif /* !_MACHINE_SF_BUF_H_ */