From: H. Peter Anvin <hpa@linux.intel.com>
Date: Wed, 29 Dec 2010 19:36:26 +0000 (-0800)
Subject: Merge branch 'x86/apic-cleanups' into x86/numa
X-Git-Tag: v2.6.38-rc1~415^2~6^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d50e8fc7e38d88909448a723cb1f825bb3af30e2;p=thirdparty%2Fkernel%2Flinux.git

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

d50e8fc7e38d88909448a723cb1f825bb3af30e2
diff --cc arch/x86/mm/amdtopology_64.c
index 0df2623d10397,08a0069b87a50..f21962c435ed7
--- a/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);