Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752334AbdIKDnc (ORCPT ); Sun, 10 Sep 2017 23:43:32 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:6692 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751912AbdIKDnb (ORCPT ); Sun, 10 Sep 2017 23:43:31 -0400 X-IronPort-AV: E=Sophos;i="5.42,375,1500912000"; d="scan'208";a="25594929" From: Dou Liyang To: , CC: , , , , Dou Liyang Subject: [PATCH] x86/processor: Remove unused declaration of __generic_processor_info() Date: Mon, 11 Sep 2017 11:43:23 +0800 Message-ID: <1505101403-29100-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: 7EF2846BA6AF.A1DA0 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: 1523 Lines: 44 Commit: 2b85b3d22920 ("x86/acpi: Restore the order of CPU IDs") ... reverted the __generic_processor_info() to generic_processor_info(), but forgot to remove its declaration in mpspec.h together. Remove the declaration and make the comments consistent. Signed-off-by: Dou Liyang --- arch/x86/include/asm/mpspec.h | 1 - arch/x86/kernel/apic/apic.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index 831eb78..c471ca1 100644 --- a/arch/x86/include/asm/mpspec.h +++ b/arch/x86/include/asm/mpspec.h @@ -86,7 +86,6 @@ static inline void e820__memblock_alloc_reserved_mpc_new(void) { } #endif int generic_processor_info(int apicid, int version); -int __generic_processor_info(int apicid, int version, bool enabled); #define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_LOCAL_APIC) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 8315e2f..d705c76 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -2130,7 +2130,7 @@ int generic_processor_info(int apicid, int version) * Since fixing handling of boot_cpu_physical_apicid requires * another discussion and tests on each platform, we leave it * for now and here we use read_apic_id() directly in this - * function, __generic_processor_info(). + * function, generic_processor_info(). */ if (disabled_cpu_apicid != BAD_APICID && disabled_cpu_apicid != read_apic_id() && -- 2.5.5