Linux Headquarters
[ Register ]
[ About us ] [ Home Page ]

Advertisement
[ Kernel ] [ Documentation ] [ Links ] [ Books ]

Advertisement

Kernel v2.6.26-rc1 /lib/radix-tree.c

Filename:/lib/radix-tree.c
Lines Added:4
Lines Deleted:5
Also changed in: (Previous) 2.6.25-git20  2.6.25-git19  2.6.25-git18  2.6.25-git17  2.6.25-git16  2.6.25-git15 
(Following) 2.6.26-rc2  2.6.26-rc3  2.6.26-rc4  2.6.26-rc5  2.6.26-rc6  2.6.26-rc6-git1 

Location
[  2.6.26-rc1
  [  lib
     o  radix-tree.c

Patch

diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index 65f0e75..bd52171 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);
 }


Comments: webmaster (at) linuxhq.com.
Advertising: banners (at) linuxhq.com.
Compilation ©1998-2008 Linux Headquarters, Inc.