From: Juergen Gross <jgross@suse.com>
To: xen-devel@lists.xenproject.org, x86@kernel.org,
linux-kernel@vger.kernel.org
Cc: Juergen Gross <jgross@suse.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH v4 4/6] x86/entry/32: revert "Fix XEN_PV build dependency"
Date: Sat, 15 Aug 2020 12:06:39 +0200 [thread overview]
Message-ID: <20200815100641.26362-5-jgross@suse.com> (raw)
In-Reply-To: <20200815100641.26362-1-jgross@suse.com>
With 32-bit Xen PV support gone commit a4c0e91d1d65bc58
("x86/entry/32: Fix XEN_PV build dependency") can be reverted again.
Signed-off-by: Juergen Gross <jgross@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 a43366191212..337dcfd45472 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
--
2.26.2
next prev parent reply other threads:[~2020-08-15 21:44 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-15 10:06 [PATCH v4 0/6] x86/paravirt: cleanup after 32-bit PV removal Juergen Gross
2020-08-15 10:06 ` [PATCH v4 1/6] x86/paravirt: remove 32-bit support from PARAVIRT_XXL Juergen Gross
2020-08-15 15:46 ` [tip: x86/paravirt] x86/paravirt: Remove 32-bit support from CONFIG_PARAVIRT_XXL tip-bot2 for Juergen Gross
2020-08-16 18:37 ` [PATCH v4 1/6] x86/paravirt: remove 32-bit support from PARAVIRT_XXL boris.ostrovsky
2020-08-15 10:06 ` [PATCH v4 2/6] x86/paravirt: cleanup paravirt macros Juergen Gross
2020-08-15 15:46 ` [tip: x86/paravirt] x86/paravirt: Clean up " tip-bot2 for Juergen Gross
2020-08-15 10:06 ` [PATCH v4 3/6] x86/paravirt: use CONFIG_PARAVIRT_XXL instead of CONFIG_PARAVIRT Juergen Gross
2020-08-15 15:46 ` [tip: x86/paravirt] x86/paravirt: Use " tip-bot2 for Juergen Gross
2020-08-15 10:06 ` Juergen Gross [this message]
2020-08-15 15:46 ` [tip: x86/paravirt] x86/entry/32: Simplify CONFIG_XEN_PV build dependency tip-bot2 for Juergen Gross
2020-08-15 10:06 ` [PATCH v4 5/6] x86/paravirt: remove set_pte_at pv-op Juergen Gross
2020-08-15 15:46 ` [tip: x86/paravirt] x86/paravirt: Remove set_pte_at() pv-op tip-bot2 for Juergen Gross
2020-08-16 18:44 ` [PATCH v4 5/6] x86/paravirt: remove set_pte_at pv-op boris.ostrovsky
2020-08-15 10:06 ` [PATCH v4 6/6] x86/paravirt: avoid needless paravirt step clearing page table entries Juergen Gross
2020-08-15 15:46 ` [tip: x86/paravirt] x86/paravirt: Avoid " tip-bot2 for Juergen Gross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200815100641.26362-5-jgross@suse.com \
--to=jgross@suse.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome