[PATCH] Make x86 latest boot with non-discontig boxes

[Glauber Costa]

Commit 0596152388e234efebce464355186ad9e16c8cb6
broke my box, since it removes completely the call to
memory_present() at e820 setup.

It seems to be really not needed with discontig memory,
but with flat and sparse, I get an early crash. The proposed patch
moves the call memory_present() to setup_memory, the one
present in setup_32.c.

Signed-off-by: Glauber Costa <gcosta@xxxxxxxxxx>
CC: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
---
 arch/x86/kernel/setup_32.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index 2901042..841eb2f 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -388,6 +388,8 @@ static unsigned long __init setup_memory(void)
 #ifdef CONFIG_FLATMEM
 	max_mapnr = num_physpages;
 #endif
+	memory_present(0, 0, max_pfn);
+
 	printk(KERN_NOTICE "%ldMB LOWMEM available.\n",
 			pages_to_mb(max_low_pfn));
 
-- 
1.5.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/