diff options
| author | Badari Pulavarty | 2008-02-07 09:14:05 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2008-02-07 17:42:19 +0100 |
| commit | 4c6bc8dd5a0932f2c0b30a5f0a124464b7f614d0 (patch) | |
| tree | 90fda3b23ed1adb780ef063df4559ca929e6378a /mm/filemap.c | |
| parent | memory controller BUG_ON() (diff) | |
| download | kernel-qcow2-linux-4c6bc8dd5a0932f2c0b30a5f0a124464b7f614d0.tar.gz kernel-qcow2-linux-4c6bc8dd5a0932f2c0b30a5f0a124464b7f614d0.tar.xz kernel-qcow2-linux-4c6bc8dd5a0932f2c0b30a5f0a124464b7f614d0.zip | |
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/filemap.c')
| -rw-r--r-- | mm/filemap.c | 3 |
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, 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; |