From 1da1301e67f8e443b7fedd423918ce9805e3c5dd Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Wed, 21 May 2008 11:21:13 +0100
Subject: [PATCH] --- yaml --- r: 99790 b: refs/heads/master c:
 f307d25e638d3408659a2ec98fb3fd1737f7cb31 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/smpboot.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 202775906455..8377b8a38c98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5deb0b2a25b7b568ab81f7c38052572ecf4ccc96
+refs/heads/master: f307d25e638d3408659a2ec98fb3fd1737f7cb31
diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c
index bf0833487455..bc1e1257e515 100644
--- a/trunk/arch/x86/kernel/smpboot.c
+++ b/trunk/arch/x86/kernel/smpboot.c
@@ -816,6 +816,7 @@ static void __cpuinit do_fork_idle(struct work_struct *work)
 	complete(&c_idle->done);
 }
 
+#ifdef CONFIG_X86_64
 /*
  * Allocate node local memory for the AP pda.
  *
@@ -852,6 +853,7 @@ static int __cpuinit get_local_pda(int cpu)
 	cpu_pda(cpu) = newpda;
 	return 0;
 }
+#endif /* CONFIG_X86_64 */
 
 static int __cpuinit do_boot_cpu(int apicid, int cpu)
 /*