From: "tip-bot2 for Juergen Gross" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Juergen Gross <jgross@suse.com>, Ingo Molnar <mingo@kernel.org>,
x86 <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [tip: x86/paravirt] x86/entry/32: Simplify CONFIG_XEN_PV build dependency
Date: Sat, 15 Aug 2020 15:46:51 -0000 [thread overview]
Message-ID: <159750641102.3192.11180286110321491044.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200815100641.26362-5-jgross@suse.com>
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 <jgross@suse.com>
AuthorDate: Sat, 15 Aug 2020 12:06:39 +02:00
Committer: Ingo Molnar <mingo@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 <jgross@suse.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200815100641.26362-5-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 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
next prev parent reply other threads:[~2020-08-15 21:58 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 ` [PATCH v4 4/6] x86/entry/32: revert "Fix XEN_PV build dependency" Juergen Gross
2020-08-15 15:46 ` tip-bot2 for Juergen Gross [this message]
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=159750641102.3192.11180286110321491044.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=x86@kernel.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
all inboxes | Powered by JetHome®