aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/aperture_64.c
diff options
context:
space:
mode:
authorWang YanQing <udknight@gmail.com>2013-04-15 21:37:34 -0400
committerIngo Molnar <mingo@kernel.org>2013-04-16 04:54:40 -0400
commit26bfc540f6f2dcbd93d0b9ed8f37830419ded7e8 (patch)
treea5ede83d7c2eb4b572d19ca12d56ae2ef226cc77 /arch/x86/kernel/aperture_64.c
parent587ff8c4eab1587044e69156f997e9d1d3b07709 (diff)
x86/mm/gart: Drop unnecessary check
The memblock_find_in_range() return value addr is guaranteed to be within "addr + aper_size" and not beyond GART_MAX_ADDR. Signed-off-by: Wang YanQing <udknight@gmail.com> Cc: yinghai@kernel.org Link: http://lkml.kernel.org/r/20130416013734.GA14641@udknight Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/aperture_64.c')
-rw-r--r--arch/x86/kernel/aperture_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
index d5fd66f0d4cd..fd972a3e4cbb 100644
--- a/arch/x86/kernel/aperture_64.c
+++ b/arch/x86/kernel/aperture_64.c
@@ -87,7 +87,7 @@ static u32 __init allocate_aperture(void)
87 */ 87 */
88 addr = memblock_find_in_range(GART_MIN_ADDR, GART_MAX_ADDR, 88 addr = memblock_find_in_range(GART_MIN_ADDR, GART_MAX_ADDR,
89 aper_size, aper_size); 89 aper_size, aper_size);
90 if (!addr || addr + aper_size > GART_MAX_ADDR) { 90 if (!addr) {
91 printk(KERN_ERR 91 printk(KERN_ERR
92 "Cannot allocate aperture memory hole (%lx,%uK)\n", 92 "Cannot allocate aperture memory hole (%lx,%uK)\n",
93 addr, aper_size>>10); 93 addr, aper_size>>10);