Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9858db50 authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds
Browse files

[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: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent dafb1367

include/linux/mm.h

+1 −6
Original line number Diff line number Diff line
@@ -1103,12 +1103,7 @@ static inline void vm_stat_account(struct mm_struct *mm, 


#ifndef CONFIG_DEBUG_PAGEALLOC

static inline void

kernel_map_pages(struct page *page, int numpages, int enable)

{

	if (!PageHighMem(page) && !enable)

		debug_check_no_locks_freed(page_address(page),

					   numpages * PAGE_SIZE);

}

kernel_map_pages(struct page *page, int numpages, int enable) {}

#endif



extern struct vm_area_struct *get_gate_vma(struct task_struct *tsk);

mm/page_alloc.c

+4 −4
Original line number Diff line number Diff line
@@ -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);