---

yaml --- r: 99914 b: refs/heads/master c: 976dd4d h: refs/heads/master v: v3
git-mirror · Jul 8, 2008 · fc916cd · fc916cd
1 parent 76e8649
commit fc916cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a58a2a6c879b2e47daafd6e641661c50ac9da5a
+refs/heads/master: 976dd4dc99c3eaf45e3802ed46e3cc06a1ad8689
diff --git a/trunk/arch/x86/kernel/e820.c b/trunk/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;
 }