diff options
| author | Dou Liyang <douly.fnst@cn.fujitsu.com> | 2017-09-11 11:43:23 +0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-09-11 08:16:37 +0200 |
| commit | e2329b4252f373c244e75928be38bf1dd45b35da (patch) | |
| tree | da7ed32381b8237d94f560c8fbcbe5c98ea1998b | |
| parent | 21d9bb4a05bac50fb4f850517af4030baecd00f6 (diff) | |
| download | linux-e2329b4252f373c244e75928be38bf1dd45b35da.tar.gz linux-e2329b4252f373c244e75928be38bf1dd45b35da.tar.bz2 linux-e2329b4252f373c244e75928be38bf1dd45b35da.zip | |
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 <douly.fnst@cn.fujitsu.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
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 <mingo@kernel.org>
| -rw-r--r-- | arch/x86/include/asm/mpspec.h | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index 831eb7895535..c471ca1f9412 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 7834f73efbf1..6e19ef152869 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() && |