diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-25 01:14:09 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 07:10:38 -0400 |
commit | c987d12f8455b19b3b057d63bac3de161bd809fc (patch) | |
tree | eb42d14516ea0d24d023d00ed0100cbee42df28c /arch/x86/kernel/pci-calgary_64.c | |
parent | f47f9d538ecc938bed589e9d39ad7b454f3b506c (diff) |
x86: remove end_pfn in 64bit
and use max_pfn directly.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/pci-calgary_64.c')
-rw-r--r-- | arch/x86/kernel/pci-calgary_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index e28ec497e142..6959b5c45df4 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c | |||
@@ -1394,7 +1394,7 @@ void __init detect_calgary(void) | |||
1394 | return; | 1394 | return; |
1395 | } | 1395 | } |
1396 | 1396 | ||
1397 | specified_table_size = determine_tce_table_size(end_pfn * PAGE_SIZE); | 1397 | specified_table_size = determine_tce_table_size(max_pfn * PAGE_SIZE); |
1398 | 1398 | ||
1399 | for (bus = 0; bus < MAX_PHB_BUS_NUM; bus++) { | 1399 | for (bus = 0; bus < MAX_PHB_BUS_NUM; bus++) { |
1400 | struct calgary_bus_info *info = &bus_info[bus]; | 1400 | struct calgary_bus_info *info = &bus_info[bus]; |
@@ -1459,7 +1459,7 @@ int __init calgary_iommu_init(void) | |||
1459 | if (ret) { | 1459 | if (ret) { |
1460 | printk(KERN_ERR "PCI-DMA: Calgary init failed %d, " | 1460 | printk(KERN_ERR "PCI-DMA: Calgary init failed %d, " |
1461 | "falling back to no_iommu\n", ret); | 1461 | "falling back to no_iommu\n", ret); |
1462 | if (end_pfn > MAX_DMA32_PFN) | 1462 | if (max_pfn > MAX_DMA32_PFN) |
1463 | printk(KERN_ERR "WARNING more than 4GB of memory, " | 1463 | printk(KERN_ERR "WARNING more than 4GB of memory, " |
1464 | "32bit PCI may malfunction.\n"); | 1464 | "32bit PCI may malfunction.\n"); |
1465 | return ret; | 1465 | return ret; |