The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: 76fdb041c1f02311e6e05211c895e932af08b041
Gitweb:
https://git.kernel.org/tip/76fdb041c1f02311e6e05211c895e932af08b041
Author: Juergen Gross <jgr...@suse.com>
AuthorDate: Sat, 15 Aug 2020 12:06:39 +02:00
Committer: Ingo Molnar <mi...@kernel.org>
CommitterDate: Sat, 15 Aug 2020 13:52:12 +02:00
x86/entry/32: Simplify CONFIG_XEN_PV build dependency
With 32-bit Xen PV support gone, the following commit is not needed
anymore:
a4c0e91d1d65bc58 ("x86/entry/32: Fix XEN_PV build dependency")
Signed-off-by: Juergen Gross <jgr...@suse.com>
Signed-off-by: Ingo Molnar <mi...@kernel.org>
Link: https://lore.kernel.org/r/20200815100641.26362-5-jgr...@suse.com
---
arch/x86/include/asm/idtentry.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/idtentry.h b/arch/x86/include/asm/idtentry.h
index a433661..337dcfd 100644
--- a/arch/x86/include/asm/idtentry.h
+++ b/arch/x86/include/asm/idtentry.h
@@ -547,7 +547,7 @@ DECLARE_IDTENTRY_RAW(X86_TRAP_MC, exc_machine_check);
/* NMI */
DECLARE_IDTENTRY_NMI(X86_TRAP_NMI, exc_nmi);
-#if defined(CONFIG_XEN_PV) && defined(CONFIG_X86_64)
+#ifdef CONFIG_XEN_PV
DECLARE_IDTENTRY_RAW(X86_TRAP_NMI, xenpv_exc_nmi);
#endif
@@ -557,7 +557,7 @@ DECLARE_IDTENTRY_DEBUG(X86_TRAP_DB, exc_debug);
#else
DECLARE_IDTENTRY_RAW(X86_TRAP_DB, exc_debug);
#endif
-#if defined(CONFIG_XEN_PV) && defined(CONFIG_X86_64)
+#ifdef CONFIG_XEN_PV
DECLARE_IDTENTRY_RAW(X86_TRAP_DB, xenpv_exc_debug);
#endif
