From 62660fee3ff478333a78901f8fc9f830c395baef Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Wed, 6 May 2009 13:02:19 +0100
Subject: [PATCH] --- yaml --- r: 144734 b: refs/heads/master c:
 61438766514a2d7f191ce1b3cf6812eabbef4ef7 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/arch/x86/kernel/e820.c | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 12ea435a3bd4..f9d305375d0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0e5ea3268db428d19e1c5fa00e6f583861cbdbd
+refs/heads/master: 61438766514a2d7f191ce1b3cf6812eabbef4ef7
diff --git a/trunk/arch/x86/kernel/e820.c b/trunk/arch/x86/kernel/e820.c
index ef2c3563357d..006281302925 100644
--- a/trunk/arch/x86/kernel/e820.c
+++ b/trunk/arch/x86/kernel/e820.c
@@ -1074,12 +1074,13 @@ u64 __init early_reserve_e820(u64 startt, u64 sizet, u64 align)
 	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)