---

yaml --- r: 83772 b: refs/heads/master c: 4c6bc8d h: refs/heads/master v: v3
git-mirror · Feb 7, 2008 · 071a54e · 071a54e
1 parent af6f2c3
commit 071a54e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;