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 v3 7/7] x86/entry/32: revert "Fix XEN_PV build dependency"
Date: Fri, 7 Aug 2020 10:38:26 +0200 [thread overview]
Message-ID: <20200807083826.16794-8-jgross@suse.com> (raw)
In-Reply-To: <20200807083826.16794-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
prev parent reply other threads:[~2020-08-07 8:38 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-07 8:38 [PATCH v3 0/7] Remove 32-bit Xen PV guest support Juergen Gross
2020-08-07 8:38 ` [PATCH v3 1/7] x86/xen: remove " Juergen Gross
2020-08-09 2:01 ` Boris Ostrovsky
2020-08-10 4:36 ` Jürgen Groß
2020-08-07 8:38 ` [PATCH v3 2/7] x86/xen: eliminate xen-asm_64.S Juergen Gross
2020-08-09 2:04 ` Boris Ostrovsky
2020-08-10 4:36 ` Jürgen Groß
2020-08-07 8:38 ` [PATCH v3 3/7] x86/xen: drop tests for highmem in pv code Juergen Gross
2020-08-07 11:18 ` kernel test robot
2020-08-09 2:22 ` Boris Ostrovsky
2020-08-10 4:37 ` Jürgen Groß
2020-08-07 8:38 ` [PATCH v3 4/7] x86/paravirt: remove 32-bit support from PARAVIRT_XXL Juergen Gross
2020-08-07 9:39 ` peterz
2020-08-07 10:02 ` Jürgen Groß
2020-08-07 10:21 ` peterz
2020-08-09 2:34 ` Boris Ostrovsky
2020-08-10 4:39 ` Jürgen Groß
2020-08-10 16:53 ` Boris Ostrovsky
2020-08-10 18:42 ` Jürgen Groß
2020-08-07 8:38 ` [PATCH v3 5/7] x86/paravirt: cleanup paravirt macros Juergen Gross
2020-08-07 8:38 ` [PATCH v3 6/7] x86/paravirt: use CONFIG_PARAVIRT_XXL instead of CONFIG_PARAVIRT Juergen Gross
2020-08-07 8:38 ` Juergen Gross [this message]
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=20200807083826.16794-8-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;
as well as URLs for NNTP newsgroup(s).