Date: Mon, 13 Jun 2022 17:36:08 GMT From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: a29263b65651 - main - amd64: -m32 support for machine/sb_buf.h Message-ID: <202206131736.25DHa8NJ061423@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=a29263b6565145c3596356dce2e743ae13461fa7 commit a29263b6565145c3596356dce2e743ae13461fa7 Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2022-06-13 17:35:39 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> 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_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206131736.25DHa8NJ061423>