Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e5095d1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: replace CONFIG_X86_SMP with CONFIG_SMP 



The x86/Voyager subarch used to have this distinction between
 'x86 SMP support' and 'Voyager SMP support':

 config X86_SMP
	bool
	depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)

This is a pointless distinction - Voyager can (and already does) use
smp_ops to implement various SMP quirks it has - and it can be extended
more to cover all the specialities of Voyager.

So remove this complication in the Kconfig space.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f2fc0e30

arch/x86/Kconfig

+1 −6
Original line number Diff line number Diff line
@@ -173,11 +173,6 @@ config GENERIC_PENDING_IRQ 
	depends on GENERIC_HARDIRQS && SMP

	default y



config X86_SMP

	bool

	depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)

	default y



config USE_GENERIC_SMP_HELPERS

	def_bool y

	depends on SMP
@@ -203,7 +198,7 @@ config X86_BIOS_REBOOT 


config X86_TRAMPOLINE

	bool

	depends on X86_SMP || (X86_VOYAGER && SMP) || (64BIT && ACPI_SLEEP)

	depends on SMP || (64BIT && ACPI_SLEEP)

	default y



config KTIME_SCALAR

arch/x86/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ config DEBUG_PAGEALLOC 
config DEBUG_PER_CPU_MAPS

	bool "Debug access to per_cpu maps"

	depends on DEBUG_KERNEL

	depends on X86_SMP

	depends on SMP

	default n

	help

	  Say Y to verify that the per_cpu map being accessed has

arch/x86/include/asm/entry_arch.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 * is no hardware IRQ pin equivalent for them, they are triggered

 * through the ICC by us (IPIs)

 */

#ifdef CONFIG_X86_SMP

#ifdef CONFIG_SMP

BUILD_INTERRUPT(reschedule_interrupt,RESCHEDULE_VECTOR)

BUILD_INTERRUPT(call_function_interrupt,CALL_FUNCTION_VECTOR)

BUILD_INTERRUPT(call_function_single_interrupt,CALL_FUNCTION_SINGLE_VECTOR)

arch/x86/include/asm/hw_irq.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ extern asmlinkage void qic_call_function_interrupt(void); 
extern void smp_apic_timer_interrupt(struct pt_regs *);

extern void smp_spurious_interrupt(struct pt_regs *);

extern void smp_error_interrupt(struct pt_regs *);

#ifdef CONFIG_X86_SMP

#ifdef CONFIG_SMP

extern void smp_reschedule_interrupt(struct pt_regs *);

extern void smp_call_function_interrupt(struct pt_regs *);

extern void smp_call_function_single_interrupt(struct pt_regs *);

arch/x86/kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ obj-$(CONFIG_X86_CPUID) += cpuid.o 
obj-$(CONFIG_PCI)		+= early-quirks.o

apm-y				:= apm_32.o

obj-$(CONFIG_APM)		+= apm.o

obj-$(CONFIG_X86_SMP)		+= smp.o

obj-$(CONFIG_X86_SMP)		+= smpboot.o tsc_sync.o ipi.o

obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_SMP)		+= smpboot.o tsc_sync.o ipi.o

obj-$(CONFIG_SMP)		+= setup_percpu.o

obj-$(CONFIG_X86_64_SMP)	+= tsc_sync.o

obj-$(CONFIG_X86_TRAMPOLINE)	+= trampoline_$(BITS).o