Commit 7b6e1062 authored Apr 09, 2017 by Dou Liyang Committed by Thomas Gleixner Apr 14, 2017

x86/smp: Remove the redundant #ifdef CONFIG_SMP directive



The !CONFIG_X86_LOCAL_APIC section in smp.h wraps the define of
hard_smp_processor_id() into #ifndef CONFIG_SMP. But Kconfig has:

  config X86_LOCAL_APIC
    def_bool y
    depends on X86_64 || SMP || X86_32_NON_STANDARD ...

Therefore SMP can't be 'y' when X86_LOCAL_APIC == 'n'.

Remove the redundant #ifndef CONFIG_SMP.

[ tglx: Massaged changelog ]

Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
Cc: jaswinder@infradead.org
Link: http://lkml.kernel.org/r/1491734806-15413-2-git-send-email-douly.fnst@cn.fujitsu.com


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 0f08c3b2

arch/x86/include/asm/smp.h

+1 −5

Original line number	Diff line number	Diff line
		@@ -188,11 +188,7 @@ static inline int logical_smp_processor_id(void)
		extern int hard_smp_processor_id(void);

		#else /* CONFIG_X86_LOCAL_APIC */

		# ifndef CONFIG_SMP
		#define hard_smp_processor_id() 0
		# endif

		#endif /* CONFIG_X86_LOCAL_APIC */

		#ifdef CONFIG_DEBUG_NMI_SELFTEST

Admin message