From: Dou Liyang Date: Sun, 9 Apr 2017 10:46:46 +0000 (+0800) Subject: x86/smp: Remove the redundant #ifdef CONFIG_SMP directive X-Git-Tag: v4.12-rc1~145^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b6e106276fcc803e397f9b1bd4c272055c7cf5a;p=platform%2Fkernel%2Flinux-exynos.git 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 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 --- diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h index f64aaa7..47103ec 100644 --- a/arch/x86/include/asm/smp.h +++ b/arch/x86/include/asm/smp.h @@ -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 - +#define hard_smp_processor_id() 0 #endif /* CONFIG_X86_LOCAL_APIC */ #ifdef CONFIG_DEBUG_NMI_SELFTEST