aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/aperture_64.c
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-25 01:14:09 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-08 07:10:38 -0400
commitc987d12f8455b19b3b057d63bac3de161bd809fc (patch)
treeeb42d14516ea0d24d023d00ed0100cbee42df28c /arch/x86/kernel/aperture_64.c
parentf47f9d538ecc938bed589e9d39ad7b454f3b506c (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/aperture_64.c')
-rw-r--r--arch/x86/kernel/aperture_64.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
index 600470d464fa..9f907806c1a5 100644
--- a/arch/x86/kernel/aperture_64.c
+++ b/arch/x86/kernel/aperture_64.c
@@ -407,7 +407,9 @@ void __init gart_iommu_hole_init(void)
407 agp_aper_base == aper_base && 407 agp_aper_base == aper_base &&
408 agp_aper_order == aper_order) { 408 agp_aper_order == aper_order) {
409 /* the same between two setting from NB and agp */ 409 /* the same between two setting from NB and agp */
410 if (!no_iommu && end_pfn > MAX_DMA32_PFN && !printed_gart_size_msg) { 410 if (!no_iommu &&
411 max_pfn > MAX_DMA32_PFN &&
412 !printed_gart_size_msg) {
411 printk(KERN_ERR "you are using iommu with agp, but GART size is less than 64M\n"); 413 printk(KERN_ERR "you are using iommu with agp, but GART size is less than 64M\n");
412 printk(KERN_ERR "please increase GART size in your BIOS setup\n"); 414 printk(KERN_ERR "please increase GART size in your BIOS setup\n");
413 printk(KERN_ERR "if BIOS doesn't have that option, contact your HW vendor!\n"); 415 printk(KERN_ERR "if BIOS doesn't have that option, contact your HW vendor!\n");
@@ -448,7 +450,7 @@ out:
448 /* Got the aperture from the AGP bridge */ 450 /* Got the aperture from the AGP bridge */
449 } else if (swiotlb && !valid_agp) { 451 } else if (swiotlb && !valid_agp) {
450 /* Do nothing */ 452 /* Do nothing */
451 } else if ((!no_iommu && end_pfn > MAX_DMA32_PFN) || 453 } else if ((!no_iommu && max_pfn > MAX_DMA32_PFN) ||
452 force_iommu || 454 force_iommu ||
453 valid_agp || 455 valid_agp ||
454 fallback_aper_force) { 456 fallback_aper_force) {