Merge commit 'v2.6.38' into x86/mm
Ingo Molnar [Tue, 15 Mar 2011 07:29:44 +0000 (08:29 +0100)]
Conflicts:
arch/x86/mm/numa_64.c

Merge reason: Resolve the conflict, update the branch to .38.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
arch/x86/include/asm/acpi.h
arch/x86/include/asm/apic.h
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/apic/apic.c
arch/x86/kernel/smpboot.c
arch/x86/mm/init_64.c
arch/x86/xen/mmu.c
mm/page_alloc.c

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1074,8 -1137,10 +1074,8 @@@ void __init native_smp_prepare_cpus(uns
        if (!skip_ioapic_setup && nr_ioapics)
                enable_IO_APIC();
  
-       end_local_APIC_setup();
+       bsp_end_local_APIC_setup();
  
 -      map_cpu_to_logical_apicid();
 -
        if (apic->setup_portio_remap)
                apic->setup_portio_remap();
  
Simple merge
Simple merge
diff --cc mm/page_alloc.c
Simple merge