ChangeSet 1.2231.1.40, 2005/03/28 19:27:21-08:00, [EMAIL PROTECTED]
[PATCH] ppc64: numa: Remove redundant and broken overlap check
The numa code used to have to handle the fact that memory regions (as
reported by OF) had been coallesced in the lmb struct and so might
overlap
node boundaries.
Since Mike's patch went in this doesn't happen anymore, because we
iterate
over the memory regions from OF directly. This patch simply removes a
check that catered for the overlapping case, which now "can't happen".
The condition also happens to be broken in the current code, but in a
painless way, so it's as good as removed already.
Signed-off-by: Michael Ellerman <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
numa.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff -Nru a/arch/ppc64/mm/numa.c b/arch/ppc64/mm/numa.c
--- a/arch/ppc64/mm/numa.c 2005-03-28 21:15:06 -08:00
+++ b/arch/ppc64/mm/numa.c 2005-03-28 21:15:06 -08:00
@@ -614,13 +614,8 @@
if (numa_domain != nid)
continue;
- if (mem_start < end_paddr &&
- (mem_start+mem_size) > start_paddr) {
- /* should be no overlaps ! */
- dbg("free_bootmem %lx %lx\n", mem_start,
mem_size);
- free_bootmem_node(NODE_DATA(nid), mem_start,
- mem_size);
- }
+ dbg("free_bootmem %lx %lx\n", mem_start, mem_size);
+ free_bootmem_node(NODE_DATA(nid), mem_start, mem_size);
if (--ranges) /* process all ranges in cell */
goto new_range;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
