From: Nick Piggin Date: Sat, 25 Mar 2006 15:20:22 +0000 (+0100) Subject: [PATCH] mm: restore vm_normal_page check X-Git-Tag: v2.6.17-rc1~734 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=315ab19a6d12d6af7b6957090822f3057ab7e80f;p=linux-2.6 [PATCH] mm: restore vm_normal_page check Hugh is rightly concerned that the CONFIG_DEBUG_VM coverage has gone too far in vm_normal_page, considering that we expect production kernels to be shipped with the option turned off, and that the code has been under some large changes recently. Signed-off-by: Nick Piggin Signed-off-by: Linus Torvalds --- diff --git a/mm/memory.c b/mm/memory.c index 80c3fb370f..e347e106ca 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -395,12 +395,16 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr, pte_ return NULL; } -#ifdef CONFIG_DEBUG_VM + /* + * Add some anal sanity checks for now. Eventually, + * we should just do "return pfn_to_page(pfn)", but + * in the meantime we check that we get a valid pfn, + * and that the resulting page looks ok. + */ if (unlikely(!pfn_valid(pfn))) { print_bad_pte(vma, pte, addr); return NULL; } -#endif /* * NOTE! We still have PageReserved() pages in the page