Skip to content

Commit e2329b4

Browse files
douliyangIngo Molnar
authored andcommitted
x86/cpu: Remove unused and undefined __generic_processor_info() declaration
The following revert: 2b85b3d ("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 <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 21d9bb4 commit e2329b4

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

arch/x86/include/asm/mpspec.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ static inline void e820__memblock_alloc_reserved_mpc_new(void) { }
8686
#endif
8787

8888
int generic_processor_info(int apicid, int version);
89-
int __generic_processor_info(int apicid, int version, bool enabled);
9089

9190
#define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_LOCAL_APIC)
9291

arch/x86/kernel/apic/apic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2130,7 +2130,7 @@ int generic_processor_info(int apicid, int version)
21302130
* Since fixing handling of boot_cpu_physical_apicid requires
21312131
* another discussion and tests on each platform, we leave it
21322132
* for now and here we use read_apic_id() directly in this
2133-
* function, __generic_processor_info().
2133+
* function, generic_processor_info().
21342134
*/
21352135
if (disabled_cpu_apicid != BAD_APICID &&
21362136
disabled_cpu_apicid != read_apic_id() &&

0 commit comments

Comments
 (0)