[PATCH] mm: locks_freed fix
Move the lock debug checks below the page reserved checks. Also, having debug_check_no_locks_freed in kernel_map_pages is wrong. Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
dafb13673c
commit
9858db504c
@@ -495,15 +495,13 @@ static void __free_pages_ok(struct page *page, unsigned int order)
|
||||
int i;
|
||||
int reserved = 0;
|
||||
|
||||
if (!PageHighMem(page))
|
||||
debug_check_no_locks_freed(page_address(page),
|
||||
PAGE_SIZE<<order);
|
||||
|
||||
for (i = 0 ; i < (1 << order) ; ++i)
|
||||
reserved += free_pages_check(page + i);
|
||||
if (reserved)
|
||||
return;
|
||||
|
||||
if (!PageHighMem(page))
|
||||
debug_check_no_locks_freed(page_address(page),PAGE_SIZE<<order);
|
||||
arch_free_page(page, order);
|
||||
kernel_map_pages(page, 1 << order, 0);
|
||||
|
||||
@@ -787,6 +785,8 @@ static void fastcall free_hot_cold_page(struct page *page, int cold)
|
||||
if (free_pages_check(page))
|
||||
return;
|
||||
|
||||
if (!PageHighMem(page))
|
||||
debug_check_no_locks_freed(page_address(page), PAGE_SIZE);
|
||||
arch_free_page(page, 0);
|
||||
kernel_map_pages(page, 1, 0);
|
||||
|
||||
|
Reference in New Issue
Block a user