Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2329b42 authored by Dou Liyang's avatar Dou Liyang Committed by Ingo Molnar
Browse files

x86/cpu: Remove unused and undefined __generic_processor_info() declaration 



The following revert:

  2b85b3d2 ("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: default avatarDou 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: default avatarIngo Molnar <mingo@kernel.org>
parent 21d9bb4a

arch/x86/include/asm/mpspec.h

+0 −1
Original line number Diff line number Diff line
@@ -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)

arch/x86/kernel/apic/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -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() &&