3 files changed, 5 insertions, 13 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index 39ff14403d13..8b9807523efe 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -3180,8 +3180,7 @@ static void recalc_bh_state(void)
         
 struct buffer_head *alloc_buffer_head(gfp_t gfp_flags)
 {
-        struct buffer_head *ret = kmem_cache_alloc(bh_cachep,
-                                set_migrateflags(gfp_flags, __GFP_RECLAIMABLE));
+        struct buffer_head *ret = kmem_cache_alloc(bh_cachep, gfp_flags);
         if (ret) {
                 INIT_LIST_HEAD(&ret->b_assoc_buffers);
                 get_cpu_var(bh_accounting).nr++;
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 164be9da3c1b..c17ba4945203 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -144,12 +144,6 @@ static inline enum zone_type gfp_zone(gfp_t flags)
         return base + ZONE_NORMAL;
 }
 
-static inline gfp_t set_migrateflags(gfp_t gfp, gfp_t migrate_flags)
-{
-        BUG_ON((gfp & GFP_MOVABLE_MASK) == GFP_MOVABLE_MASK);
-        return (gfp & ~(GFP_MOVABLE_MASK)) | migrate_flags;
-}
-
 /*
  * There is only one page-allocator function, and two main namespaces to
  * it. The alloc_page*() variants return 'struct page *' and as such
diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index 65f0e758ec38..bd521716ab1a 100644
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -114,8 +114,7 @@ radix_tree_node_alloc(struct radix_tree_root *root)
                 }
         }
         if (ret == NULL)
-                ret = kmem_cache_alloc(radix_tree_node_cachep,
-                                set_migrateflags(gfp_mask, __GFP_RECLAIMABLE));
+                ret = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask);
 
         BUG_ON(radix_tree_is_indirect_ptr(ret));
         return ret;
@@ -150,8 +149,7 @@ int radix_tree_preload(gfp_t gfp_mask)
         rtp = &__get_cpu_var(radix_tree_preloads);
         while (rtp->nr < ARRAY_SIZE(rtp->nodes)) {
                 preempt_enable();
-                node = kmem_cache_alloc(radix_tree_node_cachep,
-                                set_migrateflags(gfp_mask, __GFP_RECLAIMABLE));
+                node = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask);
                 if (node == NULL)
                         goto out;
                 preempt_disable();
@@ -1098,7 +1096,8 @@ void __init radix_tree_init(void)
 {
         radix_tree_node_cachep = kmem_cache_create("radix_tree_node",
                         sizeof(struct radix_tree_node), 0,
-                        SLAB_PANIC, radix_tree_node_ctor);
+                        SLAB_PANIC | SLAB_RECLAIM_ACCOUNT,
+                        radix_tree_node_ctor);
         radix_tree_init_maxindex();
         hotcpu_notifier(radix_tree_callback, 0);
 }