From 5757948cc03e681daa165cec16a12ef88d207e98 Mon Sep 17 00:00:00 2001
From: Jaswinder Singh <jaswinder@infradead.org>
Date: Mon, 21 Jul 2008 21:36:40 +0530
Subject: [PATCH] --- yaml --- r: 110285 b: refs/heads/master c:
 fb26132b441e75d6ba9996efc29b42081aee0abd h: refs/heads/master i:   110283:
 202f16e5607fe633f7922f690b3ff4cb09a87926 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/process_32.c | 1 +
 trunk/include/asm-x86/smp.h        | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a095f136304d..1b2070beb21f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbc1f698a508927d21324b57500e863f9bd562b9
+refs/heads/master: fb26132b441e75d6ba9996efc29b42081aee0abd
diff --git a/trunk/arch/x86/kernel/process_32.c b/trunk/arch/x86/kernel/process_32.c
index 6490e4981261..7218bccd1766 100644
--- a/trunk/arch/x86/kernel/process_32.c
+++ b/trunk/arch/x86/kernel/process_32.c
@@ -56,6 +56,7 @@
 #include <asm/cpu.h>
 #include <asm/kdebug.h>
 #include <asm/syscalls.h>
+#include <asm/smp.h>
 
 asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
 
diff --git a/trunk/include/asm-x86/smp.h b/trunk/include/asm-x86/smp.h
index 3c877f74f279..3a1480648f65 100644
--- a/trunk/include/asm-x86/smp.h
+++ b/trunk/include/asm-x86/smp.h
@@ -34,6 +34,9 @@ extern cpumask_t cpu_initialized;
 DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);
 DECLARE_PER_CPU(cpumask_t, cpu_core_map);
 DECLARE_PER_CPU(u16, cpu_llc_id);
+#ifdef CONFIG_X86_32
+DECLARE_PER_CPU(int, cpu_number);
+#endif
 
 DECLARE_EARLY_PER_CPU(u16, x86_cpu_to_apicid);
 DECLARE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid);
@@ -142,7 +145,6 @@ extern unsigned disabled_cpus __cpuinitdata;
  * from the initial startup. We map APIC_BASE very early in page_setup(),
  * so this is correct in the x86 case.
  */
-DECLARE_PER_CPU(int, cpu_number);
 #define raw_smp_processor_id() (x86_read_percpu(cpu_number))
 extern int safe_smp_processor_id(void);