From fc95105980ca256fa56569bd3d44888a12c4fa49 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Wed, 28 Nov 2007 18:57:12 +0000
Subject: [PATCH] --- yaml --- r: 74302 b: refs/heads/master c:
 09f345da758fca1222b0971b65b2fddbdf78bb83 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 40d741688545..fc842a5ebc96 100644
--- 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
index 12376ae3f733..4ffed1cd158b 100644
--- 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.