Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)

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

diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index b972dd29289d6669fd353dcd2b3118cd93ab87cb..d1c057e71b683db7328f1c8ef619e93866e486cf 100644 (file)
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -110,7 +110,7 @@ radix_tree_node_free(struct radix_tree_node *node)
  * success, return zero, with preemption disabled.  On error, return -ENOMEM
  * with preemption not disabled.
  */
-int radix_tree_preload(int gfp_mask)
+int radix_tree_preload(gfp_t gfp_mask)
 {
        struct radix_tree_preload *rtp;
        struct radix_tree_node *node;