diff options
Diffstat (limited to 'arch/x86/kernel/cpu/intel_cacheinfo.c')
-rw-r--r-- | arch/x86/kernel/cpu/intel_cacheinfo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c index 9ecf81f9b90f..7283e98deaae 100644 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c | |||
@@ -265,7 +265,7 @@ amd_cpuid4(int leaf, union _cpuid4_leaf_eax *eax, | |||
265 | line_size = l2.line_size; | 265 | line_size = l2.line_size; |
266 | lines_per_tag = l2.lines_per_tag; | 266 | lines_per_tag = l2.lines_per_tag; |
267 | /* cpu_data has errata corrections for K7 applied */ | 267 | /* cpu_data has errata corrections for K7 applied */ |
268 | size_in_kb = current_cpu_data.x86_cache_size; | 268 | size_in_kb = __this_cpu_read(cpu_info.x86_cache_size); |
269 | break; | 269 | break; |
270 | case 3: | 270 | case 3: |
271 | if (!l3.val) | 271 | if (!l3.val) |
@@ -287,7 +287,7 @@ amd_cpuid4(int leaf, union _cpuid4_leaf_eax *eax, | |||
287 | eax->split.type = types[leaf]; | 287 | eax->split.type = types[leaf]; |
288 | eax->split.level = levels[leaf]; | 288 | eax->split.level = levels[leaf]; |
289 | eax->split.num_threads_sharing = 0; | 289 | eax->split.num_threads_sharing = 0; |
290 | eax->split.num_cores_on_die = current_cpu_data.x86_max_cores - 1; | 290 | eax->split.num_cores_on_die = __this_cpu_read(cpu_info.x86_max_cores) - 1; |
291 | 291 | ||
292 | 292 | ||
293 | if (assoc == 0xffff) | 293 | if (assoc == 0xffff) |