diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-12-29 11:36:26 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-12-29 11:36:26 -0800 |
| commit | d50e8fc7e38d88909448a723cb1f825bb3af30e2 (patch) | |
| tree | 099e969b273c3d180c89aa64b1e359ef66a9fc5d /arch/x86/mm | |
| parent | a387e95a49743cf9835c5299ca549232618d8249 (diff) | |
| parent | 0aa002fe602939370e9476e5ec32b562000a0425 (diff) | |
| download | linux-d50e8fc7e38d88909448a723cb1f825bb3af30e2.tar.gz linux-d50e8fc7e38d88909448a723cb1f825bb3af30e2.tar.bz2 linux-d50e8fc7e38d88909448a723cb1f825bb3af30e2.zip | |
Merge branch 'x86/apic-cleanups' into x86/numa
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/amdtopology_64.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/mm/amdtopology_64.c b/arch/x86/mm/amdtopology_64.c index 0df2623d1039..f21962c435ed 100644 --- a/arch/x86/mm/amdtopology_64.c +++ b/arch/x86/mm/amdtopology_64.c @@ -67,7 +67,6 @@ static __init void early_get_boot_cpu_id(void) if (smp_found_config) early_get_smp_config(); #endif - early_init_lapic_mapping(); } int __init amd_numa_init(unsigned long start_pfn, unsigned long end_pfn) |