Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4c6bc8dd5a0932f2c0b30a5f0a124464b7f614d0 Commit: 4c6bc8dd5a0932f2c0b30a5f0a124464b7f614d0 Parent: 35c754d79f4da80d5e8972f6403dd26f7962fd88 Author: Badari Pulavarty <[EMAIL PROTECTED]> AuthorDate: Thu Feb 7 00:14:05 2008 -0800 Committer: Linus Torvalds <[EMAIL PROTECTED]> CommitDate: Thu Feb 7 08:42:19 2008 -0800
mem-controller gfp-mask fix Need to strip __GFP_HIGHMEM flag while passing to mem_container_cache_charge(). Signed-off-by: Badari Pulavarty <[EMAIL PROTECTED]> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]> Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]> --- mm/filemap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 35867ab..5357fcc 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; - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html