---

yaml --- r: 74302 b: refs/heads/master c: 09f345d h: refs/heads/master v: v3
git-mirror · Nov 28, 2007 · fc95105 · fc95105
1 parent c2c5694
commit fc95105
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e84e2e132c9c66d8498e7710d4ea532d1feaaac5
+refs/heads/master: 09f345da758fca1222b0971b65b2fddbdf78bb83
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -305,7 +305,6 @@ static inline void prep_zero_page(struct page *page, int order, gfp_t gfp_flags)
 {
 	int i;
 
-	VM_BUG_ON((gfp_flags & (__GFP_WAIT | __GFP_HIGHMEM)) == __GFP_HIGHMEM);
 	/*
 	 * clear_highpage() will use KM_USER0, so it's a bug to use __GFP_ZERO
 	 * and __GFP_HIGHMEM from hard or soft interrupt context.
-Original file line number
+Diff line change
@@ Expand Up @@
     {
     	int i;
-    	VM_BUG_ON((gfp_flags & (__GFP_WAIT | __GFP_HIGHMEM)) == __GFP_HIGHMEM);
     	/*
     	 * clear_highpage() will use KM_USER0, so it's a bug to use __GFP_ZERO
     	 * and __GFP_HIGHMEM from hard or soft interrupt context.
@@ Expand Down @@