Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752187AbdDIKrT (ORCPT ); Sun, 9 Apr 2017 06:47:19 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:31919 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751922AbdDIKrM (ORCPT ); Sun, 9 Apr 2017 06:47:12 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="17517342" From: Dou Liyang To: , CC: , , , , Dou Liyang Subject: [PATCH 2/2] x86/smp: Remove the redundant #ifdef CONFIG_SMP directive Date: Sun, 9 Apr 2017 18:46:46 +0800 Message-ID: <1491734806-15413-2-git-send-email-douly.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1491734806-15413-1-git-send-email-douly.fnst@cn.fujitsu.com> References: <1491734806-15413-1-git-send-email-douly.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.167.226.106] X-yoursite-MailScanner-ID: 1BD5A47CE221.A0827 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: douly.fnst@cn.fujitsu.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 923 Lines: 39 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 --- 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