x86, apic: Remove x86_32_numa_cpu_node callback
Since commit b5660ba76b
("x86, platforms: Remove NUMAQ") removed NUMAQ,
the x86_32_numa_cpu_node() apic callback has been obsolete. Remove it.
Signed-off-by: David Rientjes <rientjes@google.com>
Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1407302348060.17503@chino.kir.corp.google.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
parent
a4355e6749
commit
80a2670379
|
@ -370,14 +370,6 @@ struct apic {
|
||||||
* won't be applied properly during early boot in this case.
|
* won't be applied properly during early boot in this case.
|
||||||
*/
|
*/
|
||||||
int (*x86_32_early_logical_apicid)(int cpu);
|
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
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1342,17 +1342,6 @@ void setup_local_APIC(void)
|
||||||
/* always use the value from LDR */
|
/* always use the value from LDR */
|
||||||
early_per_cpu(x86_cpu_to_logical_apicid, cpu) =
|
early_per_cpu(x86_cpu_to_logical_apicid, cpu) =
|
||||||
logical_smp_processor_id();
|
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
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue