2 files changed, 6 insertions, 4 deletions

diff --git a/include/asm-sh/cpu-features.h b/include/asm-sh/cpu-features.h
index e1260aae3ee3..4bccd7c032f9 100644
--- a/include/asm-sh/cpu-features.h
+++ b/include/asm-sh/cpu-features.h
@@ -19,5 +19,6 @@
 #define CPU_HAS_PERF_COUNTER    0x0010  /* Hardware performance counters */
 #define CPU_HAS_PTEA            0x0020  /* PTEA register */
 #define CPU_HAS_LLSC            0x0040  /* movli.l/movco.l */
+#define CPU_HAS_L2_CACHE        0x0080  /* Secondary cache / URAM */
 
 #endif /* __ASM_SH_CPU_FEATURES_H */
diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h
index bdd472705546..b7cba4e91a72 100644
--- a/include/asm-sh/processor.h
+++ b/include/asm-sh/processor.h
@@ -54,14 +54,15 @@ enum cpu_type {
 };
 
 struct sh_cpuinfo {
-        enum cpu_type type;
+        unsigned int type;
         unsigned long loops_per_jiffy;
 
-        struct cache_info icache;
-        struct cache_info dcache;
+        struct cache_info icache;       /* Primary I-cache */
+        struct cache_info dcache;       /* Primary D-cache */
+        struct cache_info scache;       /* Secondary cache */
 
         unsigned long flags;
-};
+} __attribute__ ((aligned(SMP_CACHE_BYTES)));
 
 extern struct sh_cpuinfo boot_cpu_data;