Merge to Fedora kernel-2.6.7-1.441

[linux-2.6.git] / arch / x86_64 / mm / init.c

diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index 8026616..186242e 100644 (file)
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -512,9 +512,7 @@ void __init reserve_bootmem_generic(unsigned long phys, unsigned len)
        /* Should check here against the e820 map to avoid double free */ 
 #ifdef CONFIG_DISCONTIGMEM
        int nid = phys_to_nid(phys);
-       if (phys < HIGH_MEMORY && nid) 
-               panic("reserve of %lx at node %d", phys, nid);
-       reserve_bootmem_node(NODE_DATA(nid), phys, len);
+       reserve_bootmem_node(NODE_DATA(nid), phys, len);
 #else                  
        reserve_bootmem(phys, len);    
 #endif