diff options
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r-- | arch/x86/kernel/cpu/intel_cacheinfo.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c index db6c25aa5776..6f9dd38029bd 100644 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c | |||
@@ -170,15 +170,15 @@ union l3_cache { | |||
170 | unsigned val; | 170 | unsigned val; |
171 | }; | 171 | }; |
172 | 172 | ||
173 | static const unsigned short assocs[] = { | 173 | static unsigned short assocs[] __cpuinitdata = { |
174 | [1] = 1, [2] = 2, [4] = 4, [6] = 8, | 174 | [1] = 1, [2] = 2, [4] = 4, [6] = 8, |
175 | [8] = 16, [0xa] = 32, [0xb] = 48, | 175 | [8] = 16, [0xa] = 32, [0xb] = 48, |
176 | [0xc] = 64, | 176 | [0xc] = 64, |
177 | [0xf] = 0xffff // ?? | 177 | [0xf] = 0xffff // ?? |
178 | }; | 178 | }; |
179 | 179 | ||
180 | static const unsigned char levels[] = { 1, 1, 2, 3 }; | 180 | static unsigned char levels[] __cpuinitdata = { 1, 1, 2, 3 }; |
181 | static const unsigned char types[] = { 1, 2, 3, 3 }; | 181 | static unsigned char types[] __cpuinitdata = { 1, 2, 3, 3 }; |
182 | 182 | ||
183 | static void __cpuinit amd_cpuid4(int leaf, union _cpuid4_leaf_eax *eax, | 183 | static void __cpuinit amd_cpuid4(int leaf, union _cpuid4_leaf_eax *eax, |
184 | union _cpuid4_leaf_ebx *ebx, | 184 | union _cpuid4_leaf_ebx *ebx, |
@@ -493,8 +493,8 @@ static void __cpuinit cache_remove_shared_cpu_map(unsigned int cpu, int index) | |||
493 | } | 493 | } |
494 | } | 494 | } |
495 | #else | 495 | #else |
496 | static void __init cache_shared_cpu_map_setup(unsigned int cpu, int index) {} | 496 | static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu, int index) {} |
497 | static void __init cache_remove_shared_cpu_map(unsigned int cpu, int index) {} | 497 | static void __cpuinit cache_remove_shared_cpu_map(unsigned int cpu, int index) {} |
498 | #endif | 498 | #endif |
499 | 499 | ||
500 | static void free_cache_attributes(unsigned int cpu) | 500 | static void free_cache_attributes(unsigned int cpu) |