Commit 700c2edb authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ppc64: Fix another numa bug

From: anton@samba.org

In some cases we can merge reserved regions with the next node.  There was a
bug in the way we calculated the overlapping region which caused us to fail
during boot.
parent ffb5a29f
...@@ -273,8 +273,8 @@ void __init do_init_bootmem(void) ...@@ -273,8 +273,8 @@ void __init do_init_bootmem(void)
physbase = start_paddr; physbase = start_paddr;
} }
if (size > end_paddr - start_paddr) if (size > end_paddr - physbase)
size = end_paddr - start_paddr; size = end_paddr - physbase;
dbg("free_bootmem %lx %lx\n", physbase, size); dbg("free_bootmem %lx %lx\n", physbase, size);
free_bootmem_node(NODE_DATA(nid), physbase, free_bootmem_node(NODE_DATA(nid), physbase,
...@@ -294,8 +294,8 @@ void __init do_init_bootmem(void) ...@@ -294,8 +294,8 @@ void __init do_init_bootmem(void)
physbase = start_paddr; physbase = start_paddr;
} }
if (size > end_paddr - start_paddr) if (size > end_paddr - physbase)
size = end_paddr - start_paddr; size = end_paddr - physbase;
dbg("reserve_bootmem %lx %lx\n", physbase, dbg("reserve_bootmem %lx %lx\n", physbase,
size); size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment