aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/aperture_64.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
index bf1b469d5847..0b837bb3becb 100644
--- a/arch/x86/kernel/aperture_64.c
+++ b/arch/x86/kernel/aperture_64.c
@@ -312,6 +312,7 @@ void __init gart_iommu_hole_init(void)
312 u32 aper_size, aper_alloc = 0, aper_order = 0, last_aper_order = 0; 312 u32 aper_size, aper_alloc = 0, aper_order = 0, last_aper_order = 0;
313 u64 aper_base, last_aper_base = 0; 313 u64 aper_base, last_aper_base = 0;
314 int fix, num, valid_agp = 0; 314 int fix, num, valid_agp = 0;
315 int node;
315 316
316 if (gart_iommu_aperture_disabled || !fix_aperture || 317 if (gart_iommu_aperture_disabled || !fix_aperture ||
317 !early_pci_allowed()) 318 !early_pci_allowed())
@@ -320,6 +321,7 @@ void __init gart_iommu_hole_init(void)
320 printk(KERN_INFO "Checking aperture...\n"); 321 printk(KERN_INFO "Checking aperture...\n");
321 322
322 fix = 0; 323 fix = 0;
324 node = 0;
323 for (num = 24; num < 32; num++) { 325 for (num = 24; num < 32; num++) {
324 if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00))) 326 if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00)))
325 continue; 327 continue;
@@ -332,8 +334,9 @@ void __init gart_iommu_hole_init(void)
332 aper_base = read_pci_config(0, num, 3, 0x94) & 0x7fff; 334 aper_base = read_pci_config(0, num, 3, 0x94) & 0x7fff;
333 aper_base <<= 25; 335 aper_base <<= 25;
334 336
335 printk(KERN_INFO "CPU %d: aperture @ %Lx size %u MB\n", 337 printk(KERN_INFO "Node %d: aperture @ %Lx size %u MB\n",
336 num-24, aper_base, aper_size>>20); 338 node, aper_base, aper_size >> 20);
339 node++;
337 340
338 if (!aperture_valid(aper_base, aper_size)) { 341 if (!aperture_valid(aper_base, aper_size)) {
339 fix = 1; 342 fix = 1;