diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-11 01:48:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-11 01:48:37 -0400 |
| commit | 1a04392bd6439876b1552793389cbb5be356ea54 (patch) | |
| tree | 12af7b77e3b0848127f2d2871778c9c1f315578a /lib/radix-tree.c | |
| parent | 68399bb5080c1d96f2110b0a040b39d3ccd7a18a (diff) | |
| parent | 3c92c2ba33cd7d666c5f83cc32aa590e794e91b0 (diff) | |
Merge branch 'master'
Diffstat (limited to 'lib/radix-tree.c')
| -rw-r--r-- | lib/radix-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/radix-tree.c b/lib/radix-tree.c index 6a8bc6e06431..d1c057e71b68 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c | |||
| @@ -110,7 +110,7 @@ radix_tree_node_free(struct radix_tree_node *node) | |||
| 110 | * success, return zero, with preemption disabled. On error, return -ENOMEM | 110 | * success, return zero, with preemption disabled. On error, return -ENOMEM |
| 111 | * with preemption not disabled. | 111 | * with preemption not disabled. |
| 112 | */ | 112 | */ |
| 113 | int radix_tree_preload(unsigned int __nocast gfp_mask) | 113 | int radix_tree_preload(gfp_t gfp_mask) |
| 114 | { | 114 | { |
| 115 | struct radix_tree_preload *rtp; | 115 | struct radix_tree_preload *rtp; |
| 116 | struct radix_tree_node *node; | 116 | struct radix_tree_node *node; |