summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-01-11 14:41:26 +0000
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 08:14:16 -0800
commita4fc7ab1d065a9dd89ed0e74439ef87d4a16e980 (patch)
tree6312597ad183ee45e8769b1bc5b0035bfa681d64 /mm
parenta8b9ee7396ccc8db3bdb4108993556acbe2d3527 (diff)
downloadop-kernel-dev-a4fc7ab1d065a9dd89ed0e74439ef87d4a16e980.zip
op-kernel-dev-a4fc7ab1d065a9dd89ed0e74439ef87d4a16e980.tar.gz
[PATCH] fix/simplify mutex debugging code
Let's switch mutex_debug_check_no_locks_freed() to take (addr, len) as arguments instead, since all its callers were just calculating the 'to' address for themselves anyway... (and sometimes doing so badly). Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/page_alloc.c2
-rw-r--r--mm/slab.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index a5e6891..8e36353 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -417,7 +417,7 @@ static void __free_pages_ok(struct page *page, unsigned int order)
arch_free_page(page, order);
if (!PageHighMem(page))
mutex_debug_check_no_locks_freed(page_address(page),
- page_address(page+(1<<order)));
+ PAGE_SIZE<<order);
#ifndef CONFIG_MMU
for (i = 1 ; i < (1 << order) ; ++i)
diff --git a/mm/slab.c b/mm/slab.c
index 33aab34..9374293 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3071,7 +3071,7 @@ void kfree(const void *objp)
local_irq_save(flags);
kfree_debugcheck(objp);
c = page_get_cache(virt_to_page(objp));
- mutex_debug_check_no_locks_freed(objp, objp+obj_reallen(c));
+ mutex_debug_check_no_locks_freed(objp, obj_reallen(c));
__cache_free(c, (void *)objp);
local_irq_restore(flags);
}
OpenPOWER on IntegriCloud