x86, apic: Remove x86_32_numa_cpu_node callback

Since commit b5660ba76b41 ("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>

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index b40ea7e4bae90276bd8ed2d27cd83523c98ace1c..067c2f83e32973b0020a521742199f0effae61b7 100644 (file)
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -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
 };
 

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 6b35d308688c82f888e367cddbdd94143f8b56d4..d705bb7ed91b08d7c3cd4a4fa2528075d9c7aaf1 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -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
 
        /*