Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Wed, 16 Mar 2011 17:10:02 +0000 (10:10 -0700)]
* 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix binutils-2.21 symbol related build failures
  x86-64, trampoline: Remove unused variable
  x86, reboot: Fix the use of passed arguments in 32-bit BIOS reboot
  x86, reboot: Move the real-mode reboot code to an assembly file
  x86: Make the GDT_ENTRY() macro in <asm/segment.h> safe for assembly
  x86, trampoline: Use the unified trampoline setup for ACPI wakeup
  x86, trampoline: Common infrastructure for low memory trampolines

Fix up trivial conflicts in arch/x86/kernel/Makefile

1  2 
arch/x86/Kconfig
arch/x86/include/asm/acpi.h
arch/x86/kernel/Makefile
arch/x86/kernel/apm_32.c
arch/x86/kernel/entry_32.S
arch/x86/kernel/reboot.c
arch/x86/kernel/setup.c
arch/x86/kernel/smpboot.c
arch/x86/kernel/vmlinux.lds.S
drivers/acpi/sleep.c

Simple merge
Simple merge
@@@ -66,10 -67,9 +67,9 @@@ obj-$(CONFIG_PCI)            += early-quirks.
  apm-y                         := apm_32.o
  obj-$(CONFIG_APM)             += apm.o
  obj-$(CONFIG_SMP)             += smp.o
 -obj-$(CONFIG_SMP)             += smpboot.o tsc_sync.o
 +obj-$(CONFIG_SMP)             += smpboot.o
 +obj-$(CONFIG_SMP)             += tsc_sync.o
  obj-$(CONFIG_SMP)             += setup_percpu.o
- obj-$(CONFIG_X86_TRAMPOLINE)  += trampoline_$(BITS).o
 -obj-$(CONFIG_X86_64_SMP)      += tsc_sync.o
  obj-$(CONFIG_X86_MPPARSE)     += mpparse.o
  obj-y                         += apic/
  obj-$(CONFIG_X86_REBOOTFIXUPS)        += reboot_fixups_32.o
Simple merge
@@@ -1411,10 -1409,11 +1411,10 @@@ END(general_protection
  #ifdef CONFIG_KVM_GUEST
  ENTRY(async_page_fault)
        RING0_EC_FRAME
 -      pushl $do_async_page_fault
 -      CFI_ADJUST_CFA_OFFSET 4
 +      pushl_cfi $do_async_page_fault
        jmp error_code
        CFI_ENDPROC
- END(apf_page_fault)
+ END(async_page_fault)
  #endif
  
  /*
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge