From 622f8cf2e607fb275b0fd179f636a9a082cf0d85 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Sat, 14 Mar 2009 14:32:41 -0700
Subject: [PATCH] --- yaml --- r: 138753 b: refs/heads/master c:
 6d7942dc2a70a7e74c352107b150265602671588 h: refs/heads/master i:   138751:
 9aeeda1ebda6164a313c35cdbac7c61bd4b08c6b v: v3

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

diff --git a/[refs] b/[refs]
index 553a4d2e4538..706a20ec6303 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78a8b35bc7abf8b8333d6f625e08c0f7cc1c3742
+refs/heads/master: 6d7942dc2a70a7e74c352107b150265602671588
diff --git a/trunk/arch/x86/kernel/check.c b/trunk/arch/x86/kernel/check.c
index b617b1164f1e..fc999e6fc46a 100644
--- a/trunk/arch/x86/kernel/check.c
+++ b/trunk/arch/x86/kernel/check.c
@@ -86,12 +86,12 @@ void __init setup_bios_corruption_check(void)
 		if (!(addr + 1))
 			break;
 
+		if (addr >= corruption_check_size)
+			break;
+
 		if ((addr + size) > corruption_check_size)
 			size = corruption_check_size - addr;
 
-		if (size == 0)
-			break;
-
 		e820_update_range(addr, size, E820_RAM, E820_RESERVED);
 		scan_areas[num_scan_areas].addr = addr;
 		scan_areas[num_scan_areas].size = size;