---

yaml --- r: 99742 b: refs/heads/master c: db3660c h: refs/heads/master v: v3
git-mirror · Jun 10, 2008 · 4908c75 · 4908c75
1 parent 0bc66e2
commit 4908c75
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 237749428552e2f81ec6c801482dfd8a777e470b
+refs/heads/master: db3660c1905293b91653e07f7857576df71ebf28
diff --git a/trunk/arch/x86/kernel/setup_64.c b/trunk/arch/x86/kernel/setup_64.c
@@ -368,6 +368,7 @@ void __init setup_arch(char **cmdline_p)
 	/* update e820 for memory not covered by WB MTRRs */
 	mtrr_bp_init();
 	if (mtrr_trim_uncached_memory(end_pfn)) {
+		remove_all_active_ranges();
 		e820_register_active_regions(0, 0, -1UL);
 		end_pfn = e820_end_of_ram();
 	}