From: Badari Pulavarty Date: Thu, 7 Feb 2008 08:14:05 +0000 (-0800) Subject: mem-controller gfp-mask fix X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4c6bc8dd5a0932f2c0b30a5f0a124464b7f614d0;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git mem-controller gfp-mask fix Need to strip __GFP_HIGHMEM flag while passing to mem_container_cache_charge(). Signed-off-by: Badari Pulavarty Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- 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;