---
 include/asm-x86_64/smp.h |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Index: linux-2.6.22-rc6-mm1/include/asm-x86_64/smp.h
===================================================================
--- linux-2.6.22-rc6-mm1.orig/include/asm-x86_64/smp.h	2007-07-12 22:17:49.000000000 -0700
+++ linux-2.6.22-rc6-mm1/include/asm-x86_64/smp.h	2007-07-12 22:20:58.000000000 -0700
@@ -15,6 +15,8 @@ extern int disable_apic;
 #include <asm/io_apic.h>
 #include <asm/thread_info.h>
 
+typedef cpu_t u8
+
 #ifdef CONFIG_SMP
 
 #include <asm/pda.h>
@@ -40,7 +42,7 @@ extern void smp_send_reschedule(int cpu)
 
 DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);
 DECLARE_PER_CPU(cpumask_t, cpu_core_map);
-DECLARE_PER_CPU(u8, cpu_llc_id);
+DECLARE_PER_CPU(cpu_t, cpu_llc_id);
 
 #define SMP_TRAMPOLINE_BASE 0x6000
 
@@ -77,9 +79,9 @@ static inline int hard_smp_processor_id(
  * Some lowlevel functions might want to know about
  * the real APIC ID <-> CPU # mapping.
  */
-DECLARE_PER_CPU(u8, x86_cpu_to_apicid);		/* physical ID */
-DECLARE_PER_CPU(u8, x86_cpu_to_log_apicid);
-extern u8 bios_cpu_apicid[];
+DECLARE_PER_CPU(cpu_t, x86_cpu_to_apicid);		/* physical ID */
+DECLARE_PER_CPU(cpu_t, x86_cpu_to_log_apicid);
+extern cpu_t bios_cpu_apicid[];
 
 static inline int cpu_present_to_apicid(int mps_cpu)
 {