Merge tag 'v3.10.84' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / inode.c

diff --git a/fs/inode.c b/fs/inode.c
index 17f95b417955d35ecf1372cbff94420fe9d64286..70a24866ba20aea518d8be801bdf06bae31d7eb4 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -164,7 +164,10 @@ int inode_init_always(struct super_block *sb, struct inode *inode)
        mapping->a_ops = &empty_aops;
        mapping->host = inode;
        mapping->flags = 0;
-       mapping_set_gfp_mask(mapping, GFP_HIGHUSER_MOVABLE);
+
+        mapping_set_gfp_mask(mapping, (GFP_HIGHUSER_MOVABLE & ~__GFP_HIGHMEM) | __GFP_SLOWHIGHMEM);
+        //mapping_set_gfp_mask(mapping, GFP_HIGHUSER_MOVABLE);
+
        mapping->private_data = NULL;
        mapping->backing_dev_info = &default_backing_dev_info;
        mapping->writeback_index = 0;