Date: Wed, 28 Jul 2021 15:27:50 GMT From: =?utf-8?Q?Roger Pau Monn=C3=A9?= <royger@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: d3705b5a7fac - main - xen/control: gate x86 specific code in the preprocessor Message-ID: <202107281527.16SFRodA087869@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=d3705b5a7faca20247b17ceacc7fdf7a8c5f4839 commit d3705b5a7faca20247b17ceacc7fdf7a8c5f4839 Author: Elliott Mitchell <ehem+freebsd@m5p.com> AuthorDate: 2021-04-06 08:18:47 +0000 Commit: Roger Pau Monné <royger@FreeBSD.org> CommitDate: 2021-07-28 15:27:02 +0000 xen/control: gate x86 specific code in the preprocessor Commit 152265223048 was implemented strictly for x86. Unfortunately one of the pieces was mixed into a common area breaking other architectures. For now disable these bits on !x86, this should be cleaned up later. Fixes: 152265223048 ('xen: fix dropping bitmap IPIs during resume') Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D29306 --- sys/dev/xen/control/control.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c index a9738eeb7c2b..57251a10e6eb 100644 --- a/sys/dev/xen/control/control.c +++ b/sys/dev/xen/control/control.c @@ -132,7 +132,9 @@ __FBSDID("$FreeBSD$"); #include <machine/_inttypes.h> #include <machine/intr_machdep.h> +#if defined(__amd64__) || defined(__i386__) #include <x86/apicvar.h> +#endif #include <vm/vm.h> #include <vm/vm_extern.h> @@ -289,8 +291,10 @@ xctrl_suspend() * resume CPUs. */ resume_cpus(cpu_suspend_map); +#if defined(__amd64__) || defined(__i386__) /* Send an IPI_BITMAP in case there are pending bitmap IPIs. */ lapic_ipi_vectored(IPI_BITMAP_VECTOR, APIC_IPI_DEST_ALL); +#endif } #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107281527.16SFRodA087869>