From 3d612b6e9d173d7b0c3fbe4e1fa6a791128d8730 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Wed, 30 Jan 2008 13:33:39 +0100 Subject: [PATCH] --- yaml --- r: 80422 b: refs/heads/master c: 261a5ec36befbe6bae069be14f45e618dcd35146 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/aperture_64.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cd7eb5db7c99..5dad0ac24cbd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dff244af014144e4ac87dfc5b6e450dc8832710e +refs/heads/master: 261a5ec36befbe6bae069be14f45e618dcd35146 diff --git a/trunk/arch/x86/kernel/aperture_64.c b/trunk/arch/x86/kernel/aperture_64.c index 0b837bb3becb..608152a2a05e 100644 --- a/trunk/arch/x86/kernel/aperture_64.c +++ b/trunk/arch/x86/kernel/aperture_64.c @@ -85,10 +85,6 @@ static int __init aperture_valid(u64 aper_base, u32 aper_size) if (!aper_base) return 0; - if (aper_size < 64*1024*1024) { - printk(KERN_ERR "Aperture too small (%d MB)\n", aper_size>>20); - return 0; - } if (aper_base + aper_size > 0x100000000UL) { printk(KERN_ERR "Aperture beyond 4GB. Ignoring.\n"); return 0; @@ -97,6 +93,10 @@ static int __init aperture_valid(u64 aper_base, u32 aper_size) printk(KERN_ERR "Aperture pointing to e820 RAM. Ignoring.\n"); return 0; } + if (aper_size < 64*1024*1024) { + printk(KERN_ERR "Aperture too small (%d MB)\n", aper_size>>20); + return 0; + } return 1; }