Merge branch 'x86/apic-cleanups' into x86/numa

diff --cc arch/x86/mm/amdtopology_64.c
index 0df2623,08a0069..f21962c
--- 1/arch/x86/mm/amdtopology_64.c
--- 2/arch/x86/mm/amdtopology_64.c
+++ b/arch/x86/mm/amdtopology_64.c
@@@ -67,9 -66,21 +67,8 @@@ static __init void early_get_boot_cpu_i
        if (smp_found_config)
                early_get_smp_config();
  #endif
-       early_init_lapic_mapping();
  }
  
 -int __init amd_get_nodes(struct bootnode *physnodes)
 -{
 -      int i;
 -      int ret = 0;
 -
 -      for_each_node_mask(i, nodes_parsed) {
 -              physnodes[ret].start = nodes[i].start;
 -              physnodes[ret].end = nodes[i].end;
 -              ret++;
 -      }
 -      return ret;
 -}
 -
  int __init amd_numa_init(unsigned long start_pfn, unsigned long end_pfn)
  {
        unsigned long start = PFN_PHYS(start_pfn);