Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750968AbdIKHTZ (ORCPT ); Mon, 11 Sep 2017 03:19:25 -0400 Received: from terminus.zytor.com ([65.50.211.136]:58787 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750903AbdIKHTY (ORCPT ); Mon, 11 Sep 2017 03:19:24 -0400 Date: Mon, 11 Sep 2017 00:15:40 -0700 From: tip-bot for Dou Liyang Message-ID: Cc: tglx@linutronix.de, mingo@kernel.org, peterz@infradead.org, linux-kernel@vger.kernel.org, douly.fnst@cn.fujitsu.com, hpa@zytor.com, torvalds@linux-foundation.org Reply-To: linux-kernel@vger.kernel.org, douly.fnst@cn.fujitsu.com, peterz@infradead.org, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, torvalds@linux-foundation.org In-Reply-To: <1505101403-29100-1-git-send-email-douly.fnst@cn.fujitsu.com> References: <1505101403-29100-1-git-send-email-douly.fnst@cn.fujitsu.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/cpu: Remove unused and undefined __generic_processor_info() declaration Git-Commit-ID: e2329b4252f373c244e75928be38bf1dd45b35da X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2168 Lines: 55 Commit-ID: e2329b4252f373c244e75928be38bf1dd45b35da Gitweb: http://git.kernel.org/tip/e2329b4252f373c244e75928be38bf1dd45b35da Author: Dou Liyang AuthorDate: Mon, 11 Sep 2017 11:43:23 +0800 Committer: Ingo Molnar CommitDate: Mon, 11 Sep 2017 08:16:37 +0200 x86/cpu: Remove unused and undefined __generic_processor_info() declaration The following revert: 2b85b3d22920 ("x86/acpi: Restore the order of CPU IDs") ... got rid of __generic_processor_info(), but forgot to remove its declaration in mpspec.h. Remove the declaration and update the comments as well. Signed-off-by: Dou Liyang Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: lenb@kernel.org Link: http://lkml.kernel.org/r/1505101403-29100-1-git-send-email-douly.fnst@cn.fujitsu.com Signed-off-by: Ingo Molnar --- 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 7834f73..6e19ef1 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() &&