From e8b9fc78fdfc4b01104387b1e11fa7aa1ebc9799 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 21 Apr 2008 13:39:53 +0200
Subject: [PATCH] --- yaml --- r: 92959 b: refs/heads/master c:
 fcbc04c0ab345f6e9cabc92a15f35031a10fde9f h: refs/heads/master i:   92957:
 9a51a192c0c280587c4c75df6a06f86d76054cba   92955:
 a74ca2e95dba0bb7204211f8e3522f0166638b41   92951:
 697ae97f13997d7e22ad51aed5db8d6198f8e767   92943:
 39312c27e6a0783cfed0186fa9adcf71acba7b0e   92927:
 10ba2ba1266fda5ee31d60089cef9a07e0e49ae8 v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/x86/Kconfig                    |  2 +-
 trunk/arch/x86/mach-voyager/voyager_smp.c | 17 -----------------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index d714ff432689..022a21c734a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d33bdb7688de7a61859dafc783eb9b6bca279fc
+refs/heads/master: fcbc04c0ab345f6e9cabc92a15f35031a10fde9f
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 87a693cf2bb7..4d350b5cbc71 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -23,7 +23,7 @@ config X86
 	select HAVE_KPROBES
 	select HAVE_KRETPROBES
 	select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
-	select HAVE_ARCH_KGDB
+	select HAVE_ARCH_KGDB if !X86_VOYAGER
 
 
 config GENERIC_LOCKBREAK
diff --git a/trunk/arch/x86/mach-voyager/voyager_smp.c b/trunk/arch/x86/mach-voyager/voyager_smp.c
index 96f60c7cd124..d05722121d24 100644
--- a/trunk/arch/x86/mach-voyager/voyager_smp.c
+++ b/trunk/arch/x86/mach-voyager/voyager_smp.c
@@ -206,11 +206,6 @@ static struct irq_chip vic_chip = {
 /* used to count up as CPUs are brought on line (starts at 0) */
 static int cpucount = 0;
 
-/* steal a page from the bottom of memory for the trampoline and
- * squirrel its address away here.  This will be in kernel virtual
- * space */
-unsigned char *trampoline_base;
-
 /* The per cpu profile stuff - used in smp_local_timer_interrupt */
 static DEFINE_PER_CPU(int, prof_multiplier) = 1;
 static DEFINE_PER_CPU(int, prof_old_multiplier) = 1;
@@ -427,18 +422,6 @@ void __init smp_store_cpu_info(int id)
 	identify_secondary_cpu(c);
 }
 
-/* set up the trampoline and return the physical address of the code */
-unsigned long __init setup_trampoline(void)
-{
-	/* these two are global symbols in trampoline.S */
-	extern const __u8 trampoline_end[];
-	extern const __u8 trampoline_data[];
-
-	memcpy(trampoline_base, trampoline_data,
-	       trampoline_end - trampoline_data);
-	return virt_to_phys(trampoline_base);
-}
-
 /* Routine initially called when a non-boot CPU is brought online */
 static void __init start_secondary(void *unused)
 {