From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Tue, 3 Jun 2008 08:43:24 +0000 (-0700)
Subject: x86: remove all active memory ranges before registering them again after trimming... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=db3660c1905293b91653e07f7857576df71ebf28;p=deliverable%2Flinux.git

x86: remove all active memory ranges before registering them again after trimming - 64bit

this way we keep the early_node_map all right.

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

diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index adf3b04dc582..26d60cc0e370 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/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();
 	}