提交 7f35bf92 编写于 作者: A Andreas Mohr 提交者: Linus Torvalds

[PATCH] x86: constify some parts of arch/i386/kernel/cpu/

Signed-off-by: NAndreas Mohr <andi@lisas.de>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 19eadf98
...@@ -159,13 +159,13 @@ union l2_cache { ...@@ -159,13 +159,13 @@ union l2_cache {
unsigned val; unsigned val;
}; };
static unsigned short assocs[] = { static const unsigned short assocs[] = {
[1] = 1, [2] = 2, [4] = 4, [6] = 8, [1] = 1, [2] = 2, [4] = 4, [6] = 8,
[8] = 16, [8] = 16,
[0xf] = 0xffff // ?? [0xf] = 0xffff // ??
}; };
static unsigned char levels[] = { 1, 1, 2 }; static const unsigned char levels[] = { 1, 1, 2 };
static unsigned char types[] = { 1, 2, 3 }; static const unsigned char types[] = { 1, 2, 3 };
static void __cpuinit amd_cpuid4(int leaf, union _cpuid4_leaf_eax *eax, static void __cpuinit amd_cpuid4(int leaf, union _cpuid4_leaf_eax *eax,
union _cpuid4_leaf_ebx *ebx, union _cpuid4_leaf_ebx *ebx,
......
...@@ -18,7 +18,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) ...@@ -18,7 +18,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
* applications want to get the raw CPUID data, they should access * applications want to get the raw CPUID data, they should access
* /dev/cpu/<cpu_nr>/cpuid instead. * /dev/cpu/<cpu_nr>/cpuid instead.
*/ */
static char *x86_cap_flags[] = { static const char * const x86_cap_flags[] = {
/* Intel-defined */ /* Intel-defined */
"fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
"cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov", "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",
...@@ -62,7 +62,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) ...@@ -62,7 +62,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
}; };
static char *x86_power_flags[] = { static const char * const x86_power_flags[] = {
"ts", /* temperature sensor */ "ts", /* temperature sensor */
"fid", /* frequency id control */ "fid", /* frequency id control */
"vid", /* voltage id control */ "vid", /* voltage id control */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册