diff options
Diffstat (limited to 'lib/radix-tree.c')
-rw-r--r-- | lib/radix-tree.c | 9 |
1 files changed, 4 insertions, 5 deletions
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) | |||
114 | } | 114 | } |
115 | } | 115 | } |
116 | if (ret == NULL) | 116 | if (ret == NULL) |
117 | ret = kmem_cache_alloc(radix_tree_node_cachep, | 117 | ret = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask); |
118 | set_migrateflags(gfp_mask, __GFP_RECLAIMABLE)); | ||
119 | 118 | ||
120 | BUG_ON(radix_tree_is_indirect_ptr(ret)); | 119 | BUG_ON(radix_tree_is_indirect_ptr(ret)); |
121 | return ret; | 120 | return ret; |
@@ -150,8 +149,7 @@ int radix_tree_preload(gfp_t gfp_mask) | |||
150 | rtp = &__get_cpu_var(radix_tree_preloads); | 149 | rtp = &__get_cpu_var(radix_tree_preloads); |
151 | while (rtp->nr < ARRAY_SIZE(rtp->nodes)) { | 150 | while (rtp->nr < ARRAY_SIZE(rtp->nodes)) { |
152 | preempt_enable(); | 151 | preempt_enable(); |
153 | node = kmem_cache_alloc(radix_tree_node_cachep, | 152 | node = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask); |
154 | set_migrateflags(gfp_mask, __GFP_RECLAIMABLE)); | ||
155 | if (node == NULL) | 153 | if (node == NULL) |
156 | goto out; | 154 | goto out; |
157 | preempt_disable(); | 155 | preempt_disable(); |
@@ -1098,7 +1096,8 @@ void __init radix_tree_init(void) | |||
1098 | { | 1096 | { |
1099 | radix_tree_node_cachep = kmem_cache_create("radix_tree_node", | 1097 | radix_tree_node_cachep = kmem_cache_create("radix_tree_node", |
1100 | sizeof(struct radix_tree_node), 0, | 1098 | sizeof(struct radix_tree_node), 0, |
1101 | SLAB_PANIC, radix_tree_node_ctor); | 1099 | SLAB_PANIC | SLAB_RECLAIM_ACCOUNT, |
1100 | radix_tree_node_ctor); | ||
1102 | radix_tree_init_maxindex(); | 1101 | radix_tree_init_maxindex(); |
1103 | hotcpu_notifier(radix_tree_callback, 0); | 1102 | hotcpu_notifier(radix_tree_callback, 0); |
1104 | } | 1103 | } |