Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-block.git] / lib / radix-tree.c

diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index 3527eb3649649b5dc98f41094b8bf8d9ff1f841b..9717e2a503746c0e5a01b2e570bcd3d74d31c837 100644 (file)
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -2138,13 +2138,13 @@ int ida_pre_get(struct ida *ida, gfp_t gfp)
 }
 EXPORT_SYMBOL(ida_pre_get);
 
-void __rcu **idr_get_free(struct radix_tree_root *root,
-                       struct radix_tree_iter *iter, gfp_t gfp, int end)
+void __rcu **idr_get_free_cmn(struct radix_tree_root *root,
+                             struct radix_tree_iter *iter, gfp_t gfp,
+                             unsigned long max)
 {
        struct radix_tree_node *node = NULL, *child;
        void __rcu **slot = (void __rcu **)&root->rnode;
        unsigned long maxindex, start = iter->next_index;
-       unsigned long max = end > 0 ? end - 1 : INT_MAX;
        unsigned int shift, offset = 0;
 
  grow: