From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Tue, 24 Jun 2008 21:55:32 +0000 (-0700)
Subject: x86: fix e820_update_range size when overlapping
X-Git-Tag: v2.6.27-rc1~1106^2~172
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=976dd4dc99c3eaf45e3802ed46e3cc06a1ad8689;p=~shefty%2Frdma-dev.git

x86: fix e820_update_range size when overlapping

before that we relay on sanitize_e820_map to remove the overlap.

but e820_update_range(,,E820_RESERVED, E820_RAM) will not work

this patch fix that

who is going to use this?

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 512f779fc6a..15b4393ff9b 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -425,6 +425,11 @@ u64 __init e820_update_range(u64 start, u64 size, unsigned old_type,
 		e820_add_region(final_start, final_end - final_start,
 					 new_type);
 		real_updated_size += final_end - final_start;
+
+		ei->size -= final_end - final_start;
+		if (ei->addr < final_start)
+			continue;
+		ei->addr = final_end;
 	}
 	return real_updated_size;
 }