[<prev] [next>] [day] [month] [year] [list]
Message-Id: <4A01986B.76EA.0078.0@novell.com>
Date: Wed, 06 May 2009 13:02:19 +0100
From: "Jan Beulich" <jbeulich@...ell.com>
To: <mingo@...e.hu>, <tglx@...utronix.de>, <hpa@...or.com>
Cc: <linux-kernel@...r.kernel.org>
Subject: [PATCH] x86: fix early_reserve_e820()
Impact: bug fix
If the first non-reserved (sub-)range doesn't fit the size requested,
an endless loop will be entered. If a range returned from
find_e820_area_size() turns out insufficient in size, the range must
be skipped before calling the function again.
Signed-off-by: Jan Beulich <jbeulich@...ell.com>
---
arch/x86/kernel/e820.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
--- linux-2.6.30-rc4/arch/x86/kernel/e820.c 2009-04-30 09:42:42.000000000 +0200
+++ 2.6.30-rc4-x86-early-reserve-e820/arch/x86/kernel/e820.c 2009-05-06 11:25:44.000000000 +0200
@@ -1074,12 +1074,13 @@ u64 __init early_reserve_e820(u64 startt
u64 addr;
u64 start;
- start = startt;
- while (size < sizet && (start + 1))
+ for (start = startt; ; start += size) {
start = find_e820_area_size(start, &size, align);
-
- if (size < sizet)
- return 0;
+ if (!(start + 1))
+ return 0;
+ if (size >= sizet)
+ break;
+ }
#ifdef CONFIG_X86_32
if (start >= MAXMEM)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists