From 071a54e5865269248027e28b3972286a0627553e Mon Sep 17 00:00:00 2001
From: Badari Pulavarty <pbadari@gmail.com>
Date: Thu, 7 Feb 2008 00:14:05 -0800
Subject: [PATCH] --- yaml --- r: 83772 b: refs/heads/master c:
 4c6bc8dd5a0932f2c0b30a5f0a124464b7f614d0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ae01e35ed032..0336c117419d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35c754d79f4da80d5e8972f6403dd26f7962fd88
+refs/heads/master: 4c6bc8dd5a0932f2c0b30a5f0a124464b7f614d0
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index 35867ab72640..5357fcc4643b 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -460,7 +460,8 @@ int filemap_write_and_wait_range(struct address_space *mapping,
 int add_to_page_cache(struct page *page, struct address_space *mapping,
 		pgoff_t offset, gfp_t gfp_mask)
 {
-	int error = mem_cgroup_cache_charge(page, current->mm, gfp_mask);
+	int error = mem_cgroup_cache_charge(page, current->mm,
+					gfp_mask & ~__GFP_HIGHMEM);
 	if (error)
 		goto out;