We don't really need a helper symbol for that. For one, it's
pointlessly getting set to Y for all configurations (even 64-bit ones).
And then the purpose can be fulfilled by suitably adjusting
X86_UP_APIC: Hide its prompt when PCI_MSI, and default it to PCI_MSI.
Signed-off-by: Jan Beulich <[email protected]>
Cc: Bryan O'Donoghue <[email protected]>
---
arch/x86/Kconfig | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
--- 3.19-rc7/arch/x86/Kconfig
+++ 3.19-rc7-x86-Kconfig-UP-APIC-MSI/arch/x86/Kconfig
@@ -856,7 +856,8 @@ config SCHED_MC
source "kernel/Kconfig.preempt"
config X86_UP_APIC
- bool "Local APIC support on uniprocessors"
+ bool "Local APIC support on uniprocessors" if !PCI_MSI
+ default PCI_MSI
depends on X86_32 && !SMP && !X86_32_NON_STANDARD
---help---
A local APIC (Advanced Programmable Interrupt Controller) is an
@@ -868,10 +869,6 @@ config X86_UP_APIC
performance counters), and the NMI watchdog which detects hard
lockups.
-config X86_UP_APIC_MSI
- def_bool y
- select X86_UP_APIC if X86_32 && !SMP && !X86_32_NON_STANDARD && PCI_MSI
-
config X86_UP_IOAPIC
bool "IO-APIC support on uniprocessors"
depends on X86_UP_APIC
On 05/02/15 15:31, Jan Beulich wrote:
> We don't really need a helper symbol for that. For one, it's
> pointlessly getting set to Y for all configurations (even 64-bit ones).
> And then the purpose can be fulfilled by suitably adjusting
> X86_UP_APIC: Hide its prompt when PCI_MSI, and default it to PCI_MSI.
ACK
tested works for me the same as the previous patch - plus it's one
symbol les.
Tested-by: Bryan O'Donoghue <[email protected]>
Commit-ID: 50849eefea3ba8aa6e540e0cbdc9533098f25656
Gitweb: http://git.kernel.org/tip/50849eefea3ba8aa6e540e0cbdc9533098f25656
Author: Jan Beulich <[email protected]>
AuthorDate: Thu, 5 Feb 2015 15:31:56 +0000
Committer: Ingo Molnar <[email protected]>
CommitDate: Wed, 18 Feb 2015 22:10:54 +0100
x86/Kconfig: Simplify X86_UP_APIC handling
We don't really need a helper symbol for that. For one, it's
pointlessly getting set to Y for all configurations (even 64-bit
ones). And then the purpose can be fulfilled by suitably
adjusting X86_UP_APIC: Hide its prompt when PCI_MSI, and default
it to PCI_MSI.
Tested-by: Bryan O'Donoghue <[email protected]>
Signed-off-by: Jan Beulich <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/Kconfig | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index afb75f5..c226c2b 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -859,7 +859,8 @@ config UP_LATE_INIT
depends on !SMP && X86_LOCAL_APIC
config X86_UP_APIC
- bool "Local APIC support on uniprocessors"
+ bool "Local APIC support on uniprocessors" if !PCI_MSI
+ default PCI_MSI
depends on X86_32 && !SMP && !X86_32_NON_STANDARD
---help---
A local APIC (Advanced Programmable Interrupt Controller) is an
@@ -871,10 +872,6 @@ config X86_UP_APIC
performance counters), and the NMI watchdog which detects hard
lockups.
-config X86_UP_APIC_MSI
- def_bool y
- select X86_UP_APIC if X86_32 && !SMP && !X86_32_NON_STANDARD && PCI_MSI
-
config X86_UP_IOAPIC
bool "IO-APIC support on uniprocessors"
depends on X86_UP_APIC