From 48ee300b85f05d661697c210132778f34e4d1547 Mon Sep 17 00:00:00 2001
From: Andrew Hastings <abh@cray.com>
Date: Fri, 11 May 2007 11:23:19 +0200
Subject: [PATCH] --- yaml --- r: 56036 b: refs/heads/master c:
 547c5355d1b1167af39e315c82aa9ff1398596f4 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86_64/kernel/aperture.c | 2 +-
 trunk/arch/x86_64/kernel/pci-gart.c | 2 +-
 trunk/drivers/char/agp/amd64-agp.c  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 78d35bb534f7..02f3a5434661 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd0581bbb40d8f4b0e4b3a4de2258a50df37bb57
+refs/heads/master: 547c5355d1b1167af39e315c82aa9ff1398596f4
diff --git a/trunk/arch/x86_64/kernel/aperture.c b/trunk/arch/x86_64/kernel/aperture.c
index a52af5820592..a3d450d6c15b 100644
--- a/trunk/arch/x86_64/kernel/aperture.c
+++ b/trunk/arch/x86_64/kernel/aperture.c
@@ -86,7 +86,7 @@ static int __init aperture_valid(u64 aper_base, u32 aper_size)
 		printk("Aperture too small (%d MB)\n", aper_size>>20);
 		return 0;
 	}
-	if (aper_base + aper_size >= 0xffffffff) { 
+	if (aper_base + aper_size > 0x100000000UL) {
 		printk("Aperture beyond 4GB. Ignoring.\n");
 		return 0; 
 	}
diff --git a/trunk/arch/x86_64/kernel/pci-gart.c b/trunk/arch/x86_64/kernel/pci-gart.c
index 373ef66ca1dc..ae091cdc1a4d 100644
--- a/trunk/arch/x86_64/kernel/pci-gart.c
+++ b/trunk/arch/x86_64/kernel/pci-gart.c
@@ -476,7 +476,7 @@ static __init unsigned read_aperture(struct pci_dev *dev, u32 *size)
 	aper_base <<= 25;
 
 	aper_size = (32 * 1024 * 1024) << aper_order; 
-	if (aper_base + aper_size >= 0xffffffff || !aper_size)
+       if (aper_base + aper_size > 0x100000000UL || !aper_size)
 		aper_base = 0;
 
 	*size = aper_size;
diff --git a/trunk/drivers/char/agp/amd64-agp.c b/trunk/drivers/char/agp/amd64-agp.c
index c9f0f250d78f..801abdd29066 100644
--- a/trunk/drivers/char/agp/amd64-agp.c
+++ b/trunk/drivers/char/agp/amd64-agp.c
@@ -268,7 +268,7 @@ static int __devinit aperture_valid(u64 aper, u32 size)
 		printk(KERN_ERR PFX "Aperture too small (%d MB)\n", size>>20);
 		return 0;
 	}
-	if (aper + size > 0xffffffff) {
+       if ((u64)aper + size > 0x100000000ULL) {
 		printk(KERN_ERR PFX "Aperture out of bounds\n");
 		return 0;
 	}