aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorBadari Pulavarty <pbadari@gmail.com>2008-02-07 03:14:05 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 11:42:19 -0500
commit4c6bc8dd5a0932f2c0b30a5f0a124464b7f614d0 (patch)
tree90fda3b23ed1adb780ef063df4559ca929e6378a /mm
parent35c754d79f4da80d5e8972f6403dd26f7962fd88 (diff)
mem-controller gfp-mask fix
Need to strip __GFP_HIGHMEM flag while passing to mem_container_cache_charge(). Signed-off-by: Badari Pulavarty <pbadari@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/filemap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 35867ab72640..5357fcc4643b 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -460,7 +460,8 @@ int filemap_write_and_wait_range(struct address_space *mapping,
460int add_to_page_cache(struct page *page, struct address_space *mapping, 460int add_to_page_cache(struct page *page, struct address_space *mapping,
461 pgoff_t offset, gfp_t gfp_mask) 461 pgoff_t offset, gfp_t gfp_mask)
462{ 462{
463 int error = mem_cgroup_cache_charge(page, current->mm, gfp_mask); 463 int error = mem_cgroup_cache_charge(page, current->mm,
464 gfp_mask & ~__GFP_HIGHMEM);
464 if (error) 465 if (error)
465 goto out; 466 goto out;
466 467