diff options
| author | Dou Liyang <douly.fnst@cn.fujitsu.com> | 2017-04-09 18:46:46 +0800 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-04-14 22:43:00 +0200 |
| commit | 7b6e106276fcc803e397f9b1bd4c272055c7cf5a (patch) | |
| tree | e76309d8cef2f835ee3282f8f57c47d4bb504429 /arch | |
| parent | 0f08c3b22996c91cff62c96cf4b3db88902e12a9 (diff) | |
| download | linux-stable-7b6e106276fcc803e397f9b1bd4c272055c7cf5a.tar.gz linux-stable-7b6e106276fcc803e397f9b1bd4c272055c7cf5a.tar.bz2 linux-stable-7b6e106276fcc803e397f9b1bd4c272055c7cf5a.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/smp.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h index f64aaa72a301..47103eca3775 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 |