From c2c5694d901247f8eee390362b8571dc94b807fb Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Wed, 28 Nov 2007 18:55:10 +0000
Subject: [PATCH] --- yaml --- r: 74301 b: refs/heads/master c:
 e84e2e132c9c66d8498e7710d4ea532d1feaaac5 h: refs/heads/master i:   74299:
 2197f87025249196f243fed59b15f174ad04ecce v: v3

---
 [refs]           | 2 +-
 trunk/mm/shmem.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 46116f2b044f..40d741688545 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bfb52ad716e74785b2402b7ea17f30e0344b8e8
+refs/heads/master: e84e2e132c9c66d8498e7710d4ea532d1feaaac5
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
index 253d205914ba..51b3d6ccddab 100644
--- a/trunk/mm/shmem.c
+++ b/trunk/mm/shmem.c
@@ -1072,7 +1072,7 @@ shmem_alloc_page(gfp_t gfp, struct shmem_inode_info *info,
 	pvma.vm_policy = mpol_shared_policy_lookup(&info->policy, idx);
 	pvma.vm_pgoff = idx;
 	pvma.vm_end = PAGE_SIZE;
-	page = alloc_page_vma(gfp | __GFP_ZERO, &pvma, 0);
+	page = alloc_page_vma(gfp, &pvma, 0);
 	mpol_free(pvma.vm_policy);
 	return page;
 }
@@ -1093,7 +1093,7 @@ shmem_swapin(struct shmem_inode_info *info,swp_entry_t entry,unsigned long idx)
 static inline struct page *
 shmem_alloc_page(gfp_t gfp,struct shmem_inode_info *info, unsigned long idx)
 {
-	return alloc_page(gfp | __GFP_ZERO);
+	return alloc_page(gfp);
 }
 #endif
 
@@ -1306,6 +1306,7 @@ static int shmem_getpage(struct inode *inode, unsigned long idx,
 
 		info->alloced++;
 		spin_unlock(&info->lock);
+		clear_highpage(filepage);
 		flush_dcache_page(filepage);
 		SetPageUptodate(filepage);
 	}