From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Mar 2011 17:10:02 +0000 (-0700)
Subject: Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: upstream/snapshot3+hdmi~11230
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e7fd3b4669f5b835c8afce28425d9f698a558115;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'x86-trampoline-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* '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
---

e7fd3b4669f5b835c8afce28425d9f698a558115
diff --cc arch/x86/kernel/Makefile
index 62445ba,778c5b93..743642f
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -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
diff --cc arch/x86/kernel/entry_32.S
index fa41f72,9ca3b0e..5c1a9197
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@@ -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
  
  /*