UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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:
Nick Piggin 2006-10-11 01:21:30 -07:00 committed by Linus Torvalds
parent dafb13673c
commit 9858db504c
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/mm.h
View File

@ -1103,12 +1103,7 @@ static inline void vm_stat_account(struct mm_struct *mm,
#ifndef CONFIG_DEBUG_PAGEALLOC #ifndef CONFIG_DEBUG_PAGEALLOC
static inline void static inline void
kernel_map_pages(struct page *page, int numpages, int enable) 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);
}
#endif #endif
extern struct vm_area_struct *get_gate_vma(struct task_struct *tsk); extern struct vm_area_struct *get_gate_vma(struct task_struct *tsk);

8
mm/page_alloc.c
View File

@ -495,15 +495,13 @@ static void __free_pages_ok(struct page *page, unsigned int order)
int i; int i;
int reserved = 0; int reserved = 0;
if (!PageHighMem(page))
debug_check_no_locks_freed(page_address(page),
PAGE_SIZE<<order);
for (i = 0 ; i < (1 << order) ; ++i) for (i = 0 ; i < (1 << order) ; ++i)
reserved += free_pages_check(page + i); reserved += free_pages_check(page + i);
if (reserved) if (reserved)
return; return;
if (!PageHighMem(page))
debug_check_no_locks_freed(page_address(page),PAGE_SIZE<<order);
arch_free_page(page, order); arch_free_page(page, order);
kernel_map_pages(page, 1 << order, 0); 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)) if (free_pages_check(page))
return; return;
if (!PageHighMem(page))
debug_check_no_locks_freed(page_address(page), PAGE_SIZE);
arch_free_page(page, 0); arch_free_page(page, 0);
kernel_map_pages(page, 1, 0); kernel_map_pages(page, 1, 0);