---

yaml --- r: 36317 b: refs/heads/master c: 2220d16 h: refs/heads/master i: 36315: 4a5906d v: v3
git-mirror · Sep 27, 2006 · ddb19b5 · ddb19b5
1 parent c5160e7
commit ddb19b5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 315bb96824149614efe4844ded077a13fc908880
+refs/heads/master: 2220d164933a8776d1336c814e3c2e5573256d34
diff --git a/trunk/arch/sh/kernel/setup.c b/trunk/arch/sh/kernel/setup.c
@@ -413,8 +413,10 @@ const char *get_cpu_subtype(void)
 }
 
 #ifdef CONFIG_PROC_FS
+/* Symbolic CPU flags, keep in sync with asm/cpu-features.h */
 static const char *cpu_flags[] = {
-	"none", "fpu", "p2flush", "mmuassoc", "dsp", "perfctr", "ptea", NULL
+	"none", "fpu", "p2flush", "mmuassoc", "dsp", "perfctr",
+	"ptea", "llsc", NULL
 };
 
 static void show_cpuflags(struct seq_file *m)

diff --git a/trunk/include/asm-sh/cpu-features.h b/trunk/include/asm-sh/cpu-features.h
@@ -3,6 +3,14 @@
 
 /*
  * Processor flags
+ *
+ * Note: When adding a new flag, keep cpu_flags[] in
+ * arch/sh/kernel/setup.c in sync so symbolic name
+ * mapping of the processor flags has a chance of being
+ * reasonably accurate.
+ *
+ * These flags are also available through the ELF
+ * auxiliary vector as AT_HWCAP.
  */
 #define CPU_HAS_FPU		0x0001	/* Hardware FPU support */
 #define CPU_HAS_P2_FLUSH_BUG	0x0002	/* Need to flush the cache in P2 area */