From 82a9137bde364658cd12650ae8ca9677f7cb8485 Mon Sep 17 00:00:00 2001 From: Wang YanQing Date: Tue, 16 Apr 2013 09:37:34 +0800 Subject: [PATCH] --- yaml --- r: 366247 b: refs/heads/master c: 26bfc540f6f2dcbd93d0b9ed8f37830419ded7e8 h: refs/heads/master i: 366245: 342672295f72b2f23e3f8a0ffc2709de5049cb21 366243: e8f12cb8623c72693f3019d41c71e7c223381d16 366239: f5a3c79883533372c0159eb7d528f01e94878221 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/aperture_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4d1d0293b805..33e9db7412a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 587ff8c4eab1587044e69156f997e9d1d3b07709 +refs/heads/master: 26bfc540f6f2dcbd93d0b9ed8f37830419ded7e8 diff --git a/trunk/arch/x86/kernel/aperture_64.c b/trunk/arch/x86/kernel/aperture_64.c index d5fd66f0d4cd..fd972a3e4cbb 100644 --- a/trunk/arch/x86/kernel/aperture_64.c +++ b/trunk/arch/x86/kernel/aperture_64.c @@ -87,7 +87,7 @@ static u32 __init allocate_aperture(void) */ addr = memblock_find_in_range(GART_MIN_ADDR, GART_MAX_ADDR, aper_size, aper_size); - if (!addr || addr + aper_size > GART_MAX_ADDR) { + if (!addr) { printk(KERN_ERR "Cannot allocate aperture memory hole (%lx,%uK)\n", addr, aper_size>>10);