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

Commit 80a26703 authored by David Rientjes's avatar David Rientjes Committed by H. Peter Anvin
Browse files

x86, apic: Remove x86_32_numa_cpu_node callback 



Since commit b5660ba7 ("x86, platforms: Remove NUMAQ") removed NUMAQ,
the x86_32_numa_cpu_node() apic callback has been obsolete.  Remove it.

Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1407302348060.17503@chino.kir.corp.google.com


Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent a4355e67

arch/x86/include/asm/apic.h

+0 −8
Original line number Diff line number Diff line
@@ -370,14 +370,6 @@ struct apic { 
	 * won't be applied properly during early boot in this case.

	 */

	int (*x86_32_early_logical_apicid)(int cpu);



	/*

	 * Optional method called from setup_local_APIC() after logical

	 * apicid is guaranteed to be known to initialize apicid -> node

	 * mapping if NUMA initialization hasn't done so already.  Don't

	 * add new users.

	 */

	int (*x86_32_numa_cpu_node)(int cpu);

#endif

};

arch/x86/kernel/apic/apic.c

+0 −11
Original line number Diff line number Diff line
@@ -1342,17 +1342,6 @@ void setup_local_APIC(void) 
	/* always use the value from LDR */

	early_per_cpu(x86_cpu_to_logical_apicid, cpu) =

		logical_smp_processor_id();



	/*

	 * Some NUMA implementations (NUMAQ) don't initialize apicid to

	 * node mapping during NUMA init.  Now that logical apicid is

	 * guaranteed to be known, give it another chance.  This is already

	 * a bit too late - percpu allocation has already happened without

	 * proper NUMA affinity.

	 */

	if (apic->x86_32_numa_cpu_node)

		set_apicid_to_node(early_per_cpu(x86_cpu_to_apicid, cpu),

				   apic->x86_32_numa_cpu_node(cpu));

#endif



	/*