diff options
Diffstat (limited to 'arch/x86/kernel/cpu/intel_cacheinfo.c')
-rw-r--r-- | arch/x86/kernel/cpu/intel_cacheinfo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c index 17ad03366211..92512ed380e7 100644 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c | |||
@@ -333,7 +333,7 @@ static void __cpuinit amd_calc_l3_indices(struct amd_l3_cache *l3) | |||
333 | static struct amd_l3_cache * __cpuinit amd_init_l3_cache(int node) | 333 | static struct amd_l3_cache * __cpuinit amd_init_l3_cache(int node) |
334 | { | 334 | { |
335 | struct amd_l3_cache *l3; | 335 | struct amd_l3_cache *l3; |
336 | struct pci_dev *dev = node_to_k8_nb_misc(node); | 336 | struct pci_dev *dev = node_to_amd_nb_misc(node); |
337 | 337 | ||
338 | l3 = kzalloc(sizeof(struct amd_l3_cache), GFP_ATOMIC); | 338 | l3 = kzalloc(sizeof(struct amd_l3_cache), GFP_ATOMIC); |
339 | if (!l3) { | 339 | if (!l3) { |
@@ -370,7 +370,7 @@ static void __cpuinit amd_check_l3_disable(struct _cpuid4_info_regs *this_leaf, | |||
370 | return; | 370 | return; |
371 | 371 | ||
372 | /* not in virtualized environments */ | 372 | /* not in virtualized environments */ |
373 | if (k8_northbridges.num == 0) | 373 | if (amd_northbridges.num == 0) |
374 | return; | 374 | return; |
375 | 375 | ||
376 | /* | 376 | /* |
@@ -378,7 +378,7 @@ static void __cpuinit amd_check_l3_disable(struct _cpuid4_info_regs *this_leaf, | |||
378 | * never freed but this is done only on shutdown so it doesn't matter. | 378 | * never freed but this is done only on shutdown so it doesn't matter. |
379 | */ | 379 | */ |
380 | if (!l3_caches) { | 380 | if (!l3_caches) { |
381 | int size = k8_northbridges.num * sizeof(struct amd_l3_cache *); | 381 | int size = amd_northbridges.num * sizeof(struct amd_l3_cache *); |
382 | 382 | ||
383 | l3_caches = kzalloc(size, GFP_ATOMIC); | 383 | l3_caches = kzalloc(size, GFP_ATOMIC); |
384 | if (!l3_caches) | 384 | if (!l3_caches) |