From b6c85e6b4fe3f34a50ec0417cacbfa42b865c20b Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Mon, 12 Sep 2005 18:49:24 +0200
Subject: [PATCH] --- yaml --- r: 8615 b: refs/heads/master c:
 47e5701e37cf10948c3f2952870d9f18b6e84965 h: refs/heads/master i:   8613:
 de6640619de5fe0cfbfc08af66acc7c26e8d46dc   8611:
 5c60673193e0e75df6271e1eb73d5106a9a7803b   8607:
 f99f919187aea31b15df00bf8e5413ab0dbe0a19 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/x86_64/kernel/smpboot.c | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 779b10f3e44c..cd2755d9720e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 016102dea838e8526a4bc57821309f0cd9db81b7
+refs/heads/master: 47e5701e37cf10948c3f2952870d9f18b6e84965
diff --git a/trunk/arch/x86_64/kernel/smpboot.c b/trunk/arch/x86_64/kernel/smpboot.c
index 277ce5e91e04..5b7aadbef5f9 100644
--- a/trunk/arch/x86_64/kernel/smpboot.c
+++ b/trunk/arch/x86_64/kernel/smpboot.c
@@ -859,17 +859,6 @@ static __cpuinit void smp_cleanup_boot(void)
 	 * Reset trampoline flag
 	 */
 	*((volatile int *) phys_to_virt(0x467)) = 0;
-
-#ifndef CONFIG_HOTPLUG_CPU
-	/*
-	 * Free pages reserved for SMP bootup.
-	 * When you add hotplug CPU support later remove this
-	 * Note there is more work to be done for later CPU bootup.
-	 */
-
-	free_page((unsigned long) __va(PAGE_SIZE));
-	free_page((unsigned long) __va(SMP_TRAMPOLINE_BASE));
-#endif
 }
 
 /*