sh: More SH-5 cpuinfo tidying.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

4 files changed, 12 insertions, 5 deletions

diff --git a/include/asm-sh/cpu-sh5/cache.h b/include/asm-sh/cpu-sh5/cache.h
index 2d1f9c28b923..7eaa8894649f 100644
--- a/include/asm-sh/cpu-sh5/cache.h
+++ b/include/asm-sh/cpu-sh5/cache.h
@@ -19,6 +19,10 @@
 #define SH_CACHE_VALID          (1LL<<0)
 #define SH_CACHE_UPDATED        (1LL<<57)
 
+/* Unimplemented compat bits.. */
+#define SH_CACHE_COMBINED       0
+#define SH_CACHE_ASSOC          0
+
 /* Cache flags */
 #define SH_CACHE_MODE_WT        (1LL<<0)
 #define SH_CACHE_MODE_WB        (1LL<<1)
diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h
index bf01f486c3e1..b98c882d5036 100644
--- a/include/asm-sh/processor.h
+++ b/include/asm-sh/processor.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_SH_PROCESSOR_H
 #define __ASM_SH_PROCESSOR_H
 
+#include <asm/cpu-features.h>
+
 /*
  *  CPU type and hardware bug flags. Kept separately for each CPU.
  *
diff --git a/include/asm-sh/processor_32.h b/include/asm-sh/processor_32.h
index e10d0ee0c22b..35040fe43e5e 100644
--- a/include/asm-sh/processor_32.h
+++ b/include/asm-sh/processor_32.h
@@ -14,7 +14,6 @@
 #include <asm/types.h>
 #include <asm/cache.h>
 #include <asm/ptrace.h>
-#include <asm/cpu-features.h>
 
 /*
  * Default implementation of macro that returns current
diff --git a/include/asm-sh/processor_64.h b/include/asm-sh/processor_64.h
index 6ad23387d7ba..ecd6b403f7db 100644
--- a/include/asm-sh/processor_64.h
+++ b/include/asm-sh/processor_64.h
@@ -66,12 +66,14 @@ struct sh_cpuinfo {
         /* TLB info */
         struct tlb_info itlb;
         struct tlb_info dtlb;
-};
 
-extern struct sh_cpuinfo boot_cpu_data;
+        unsigned long flags;
+};
 
-#define cpu_data (&boot_cpu_data)
-#define current_cpu_data boot_cpu_data
+extern struct sh_cpuinfo cpu_data[];
+#define boot_cpu_data cpu_data[0]
+#define current_cpu_data cpu_data[smp_processor_id()]
+#define raw_current_cpu_data cpu_data[raw_smp_processor_id()]
 
 #endif