linux-kernel - [PATCH 2/2] x86/smp: Remove the redundant #ifdef CONFIG

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1491734806-15413-2-git-send-email-douly.fnst@cn.fujitsu.com>
Date:   Sun, 9 Apr 2017 18:46:46 +0800
From:   Dou Liyang <douly.fnst@...fujitsu.com>
To:     <x86@...nel.org>, <linux-kernel@...r.kernel.org>
CC:     <tglx@...utronix.de>, <mingo@...nel.org>, <hpa@...or.com>,
        <jaswinder@...radead.org>, Dou Liyang <douly.fnst@...fujitsu.com>
Subject: [PATCH 2/2] x86/smp: Remove the redundant #ifdef CONFIG_SMP directive

According to:
  ...
  config X86_LOCAL_APIC
     def_bool y
     depends on X86_64 || SMP || X86_32_NON_STANDARD ...
  ...
in arch/x86/Kconfig

If X86_LOCAL_APIC is n, the SMP must be n.

So, Remove the redundant #ifdef CONFIG_SMP directive in the case of
!X86_LOCAL_APIC.

Signed-off-by: Dou Liyang <douly.fnst@...fujitsu.com>
---
 arch/x86/include/asm/smp.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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
-- 
2.5.5