Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754668AbdIGIto (ORCPT ); Thu, 7 Sep 2017 04:49:44 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:28595 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752778AbdIGItn (ORCPT ); Thu, 7 Sep 2017 04:49:43 -0400 X-IronPort-AV: E=Sophos;i="5.42,357,1500912000"; d="scan'208";a="25380960" From: Dou Liyang To: , CC: , , , , Dou Liyang Subject: [PATCH 1/2] x86/apic: Remove duplicate judgement of X86_64 in lapic_is_integrated() Date: Thu, 7 Sep 2017 16:49:20 +0800 Message-ID: <1504774161-7137-1-git-send-email-douly.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.5.5 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.167.226.106] X-yoursite-MailScanner-ID: 4A449472556A.AEB16 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: 780 Lines: 33 The macro APIC_INTEGRATED(x) has already wrapped by CONFIG_X86_32. So Invoke it directly. But lapic_is_integrated() invokes APIC_INTEGRATED(x) with the duplicate judgement of X86_64. Remove the "#ifdef CONFIG_X86_64...". No functionality change. Signed-off-by: Dou Liyang --- arch/x86/kernel/apic/apic.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 7834f73..63b3ae9 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -211,11 +211,7 @@ static inline int lapic_get_version(void) */ static inline int lapic_is_integrated(void) { -#ifdef CONFIG_X86_64 - return 1; -#else return APIC_INTEGRATED(lapic_get_version()); -#endif } /* -- 2.5.5