diff options
author | Andrew Hastings <abh@cray.com> | 2007-05-11 05:23:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 15:53:00 -0400 |
commit | 547c5355d1b1167af39e315c82aa9ff1398596f4 (patch) | |
tree | 423d8e1473c5731040b35ae5665dc72f5233abb4 /drivers/char/agp/amd64-agp.c | |
parent | fd0581bbb40d8f4b0e4b3a4de2258a50df37bb57 (diff) |
x86_64: off-by-two error in aperture.c
I'm using a custom BIOS to configure the northbridge GART at address
0x80000000, size 2G. Linux complains:
"Aperture from northbridge cpu 0 beyond 4GB. Ignoring."
I think there's an off-by-two error in arch/x86_64/kernel/aperture.c:
AK: use correct types for i386
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/agp/amd64-agp.c')
-rw-r--r-- | drivers/char/agp/amd64-agp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index c9f0f250d78f..801abdd29066 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c | |||
@@ -268,7 +268,7 @@ static int __devinit aperture_valid(u64 aper, u32 size) | |||
268 | printk(KERN_ERR PFX "Aperture too small (%d MB)\n", size>>20); | 268 | printk(KERN_ERR PFX "Aperture too small (%d MB)\n", size>>20); |
269 | return 0; | 269 | return 0; |
270 | } | 270 | } |
271 | if (aper + size > 0xffffffff) { | 271 | if ((u64)aper + size > 0x100000000ULL) { |
272 | printk(KERN_ERR PFX "Aperture out of bounds\n"); | 272 | printk(KERN_ERR PFX "Aperture out of bounds\n"); |
273 | return 0; | 273 | return 0; |
274 | } | 274 | } |