diff options
| -rw-r--r-- | arch/i386/kernel/cpu/intel_cacheinfo.c | 6 | ||||
| -rw-r--r-- | arch/i386/kernel/cpu/proc.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/i386/kernel/cpu/intel_cacheinfo.c b/arch/i386/kernel/cpu/intel_cacheinfo.c index 6c37b4fd8ce2..f24a0145024c 100644 --- a/arch/i386/kernel/cpu/intel_cacheinfo.c +++ b/arch/i386/kernel/cpu/intel_cacheinfo.c | |||
| @@ -159,13 +159,13 @@ union l2_cache { | |||
| 159 | unsigned val; | 159 | unsigned val; |
| 160 | }; | 160 | }; |
| 161 | 161 | ||
| 162 | static unsigned short assocs[] = { | 162 | static const unsigned short assocs[] = { |
| 163 | [1] = 1, [2] = 2, [4] = 4, [6] = 8, | 163 | [1] = 1, [2] = 2, [4] = 4, [6] = 8, |
| 164 | [8] = 16, | 164 | [8] = 16, |
| 165 | [0xf] = 0xffff // ?? | 165 | [0xf] = 0xffff // ?? |
| 166 | }; | 166 | }; |
| 167 | static unsigned char levels[] = { 1, 1, 2 }; | 167 | static const unsigned char levels[] = { 1, 1, 2 }; |
| 168 | static unsigned char types[] = { 1, 2, 3 }; | 168 | static const unsigned char types[] = { 1, 2, 3 }; |
| 169 | 169 | ||
| 170 | static void __cpuinit amd_cpuid4(int leaf, union _cpuid4_leaf_eax *eax, | 170 | static void __cpuinit amd_cpuid4(int leaf, union _cpuid4_leaf_eax *eax, |
| 171 | union _cpuid4_leaf_ebx *ebx, | 171 | union _cpuid4_leaf_ebx *ebx, |
diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c index a19fcb262dbb..4b03f9f58328 100644 --- a/arch/i386/kernel/cpu/proc.c +++ b/arch/i386/kernel/cpu/proc.c | |||
| @@ -18,7 +18,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 18 | * applications want to get the raw CPUID data, they should access | 18 | * applications want to get the raw CPUID data, they should access |
| 19 | * /dev/cpu/<cpu_nr>/cpuid instead. | 19 | * /dev/cpu/<cpu_nr>/cpuid instead. |
| 20 | */ | 20 | */ |
| 21 | static char *x86_cap_flags[] = { | 21 | static const char * const x86_cap_flags[] = { |
| 22 | /* Intel-defined */ | 22 | /* Intel-defined */ |
| 23 | "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", | 23 | "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", |
| 24 | "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov", | 24 | "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov", |
| @@ -62,7 +62,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 62 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 62 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
| 63 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 63 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
| 64 | }; | 64 | }; |
| 65 | static char *x86_power_flags[] = { | 65 | static const char * const x86_power_flags[] = { |
| 66 | "ts", /* temperature sensor */ | 66 | "ts", /* temperature sensor */ |
| 67 | "fid", /* frequency id control */ | 67 | "fid", /* frequency id control */ |
| 68 | "vid", /* voltage id control */ | 68 | "vid", /* voltage id control */ |
