x86/vsmp_64.c: Remove dependency on pv_irq_ops
PATCH v3 1/1 x86/vsmp_64.c: Remove dependency on pv_irq_ops
vSMP dependency on pv_irq_ops has been removed some years ago, but the code still deals with pv_irq_ops.
In short, "cap & ctl & (1 << 4)" is always returning 0, so all PARAVIRT/PARAVIRT_XXL code related to that can be removed.
However, the rest of the code depends on CONFIG_PCI, so fix it accordingly.
Rename set_vsmp_pv_ops to set_vsmp_ctl as the original name does not make sense anymore.
--- arch/x86/Kconfig | 1 - arch/x86/kernel/vsmp_64.c | 84 ++++------------------------------------------- 2 files changed, 7 insertions(+), 78 deletions(-)
arch/x86/Kconfig +0 -1
@@ -525,7 +525,6 @@ config X86_VSMP bool "ScaleMP vSMP" select HYPERVISOR_GUEST select PARAVIRT - select PARAVIRT_XXL depends on X86_64 && PCI depends on X86_EXTENDED_PLATFORM depends on SMP
arch/x86/kernel/vsmp_64.c +7 -77
117 lines not on this page · raw message
Signature · 1 line
2.7.4
Quoted 1 line · Eial Czerwacki
+#if
defined(CONFIG_PCI)
This is shorter:
#ifdef CONFIG_PCI
Thanks,
Ingo
Greetings Ingo,
Quoted 5 lines · Ingo Molnar
Quoted 1 line · Eial Czerwacki
+#if
defined(CONFIG_PCI)
Quoted 8 lines
This is shorter:
#ifdef CONFIG_PCIThanks,
Ingo
you are absolutely right, looks like Thomas have handled it already.
Eial.
tip-bot for Eial Czerwacki
merge bot[tip:x86/urgent] x86/vsmp: Remove dependency on pv_irq_ops
In reply to Eial Czerwackix86/vsmp: Remove dependency on pv_irq_ops
Commit-ID: a48777fdda7d13179979a889e1fb87655a783cc0 Gitweb: https://git.kernel.org/tip/a48777fdda7d13179979a889e1fb87655a783cc0 Author: Eial Czerwacki <[email protected]> AuthorDate: Mon, 5 Nov 2018 19:31:54 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 6 Nov 2018 21:35:11 +0100
x86/vsmp: Remove dependency on pv_irq_ops
vSMP dependency on pv_irq_ops has been removed some years ago, but the code still deals with pv_irq_ops.
In short, "cap & ctl & (1 << 4)" is always returning 0, so all PARAVIRT/PARAVIRT_XXL code related to that can be removed.
However, the rest of the code depends on CONFIG_PCI, so fix it accordingly.
Rename set_vsmp_pv_ops to set_vsmp_ctl as the original name does not make sense anymore.
--- arch/x86/Kconfig | 1 - arch/x86/kernel/vsmp_64.c | 84 ++++------------------------------------------- 2 files changed, 7 insertions(+), 78 deletions(-)
arch/x86/Kconfig +0 -1
@@ -525,7 +525,6 @@ config X86_VSMP bool "ScaleMP vSMP" select HYPERVISOR_GUEST select PARAVIRT - select PARAVIRT_XXL depends on X86_64 && PCI depends on X86_EXTENDED_PLATFORM depends on SMP
arch/x86/kernel/vsmp_64.c +7 -77
117 lines not on this page · raw message