From: Andrew Morton <akpm@linux-foundation.org>

Fix git-acpi versus git-x86 conflict.

Generally, adding new code at the end-of-file is a bad idea - because that's
where everyone else adds new code!  Please prefer to add new stuff in the body
of the C file, preferably somewhere logical.  

Cc: Len Brown <lenb@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86/kernel/setup_64.c |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff -puN arch/x86/kernel/setup_64.c~git-acpi-fixup arch/x86/kernel/setup_64.c
--- a/arch/x86/kernel/setup_64.c~git-acpi-fixup
+++ a/arch/x86/kernel/setup_64.c
@@ -1088,3 +1088,18 @@ static __init int setup_disablecpuid(cha
 	return 1;
 }
 __setup("clearcpuid=", setup_disablecpuid);
+
+#ifdef CONFIG_X86_TRAMPOLINE
+/*
+ * Currently trivial. Write the real->protected mode
+ * bootstrap into the page concerned. The caller
+ * has made sure it's suitably aligned.
+ */
+
+unsigned long setup_trampoline(void)
+{
+	void *tramp = __va(TRAMPOLINE_BASE);
+	memcpy(tramp, trampoline_data, trampoline_end - trampoline_data);
+	return virt_to_phys(tramp);
+}
+#endif /* CONFIG_X86_TRAMPOLINE */
_