---

yaml --- r: 23693 b: refs/heads/master c: 315ab19 h: refs/heads/master i: 23691: a36d205 v: v3
git-mirror · Mar 25, 2006 · ba97482 · ba97482
1 parent f740df7
commit ba97482
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f081a529f808ed450c22553de7b3275e0ffde9a0
+refs/heads/master: 315ab19a6d12d6af7b6957090822f3057ab7e80f
diff --git a/trunk/mm/memory.c b/trunk/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