From 982818e03d54dcc2729bf73d4fc687b322b78e17 Mon Sep 17 00:00:00 2001 From: Carsten Otte Date: Thu, 17 Jan 2008 15:21:17 -0800 Subject: [PATCH] --- yaml --- r: 75531 b: refs/heads/master c: 9723198c219f3546982cb469e5aed26e68399055 h: refs/heads/master i: 75529: 219391bfdb69d58749404356d09b91e2555c7195 75527: c8033b9e1ab135d12e8b123d3952e64e998474e4 v: v3 --- [refs] | 2 +- trunk/mm/memory.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f62d1018b512..4f1a31337885 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b2d2cec1081a979e0efd6a1e9559e5a01a3c10e +refs/heads/master: 9723198c219f3546982cb469e5aed26e68399055 diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index 4bf0b6d0eb2a..6dd1cd88bfb6 100644 --- a/trunk/mm/memory.c +++ b/trunk/mm/memory.c @@ -392,6 +392,7 @@ 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 @@ -402,6 +403,7 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr, pte_ print_bad_pte(vma, pte, addr); return NULL; } +#endif /* * NOTE! We still have PageReserved() pages in the page