diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-23 11:32:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-23 11:32:34 +0200 |
| commit | a6b9b4d50f492630443b38404d1f436b3b748c14 (patch) | |
| tree | f3512389c42cecfae50b6a315ec6ab1fa470e30d /lib/radix-tree.c | |
| parent | workqueue: Add basic tracepoints to track workqueue execution (diff) | |
| parent | vhost: add __rcu annotations (diff) | |
| download | linux-a6b9b4d50f492630443b38404d1f436b3b748c14.tar.xz linux-a6b9b4d50f492630443b38404d1f436b3b748c14.zip | |
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/rcu
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 5b7d4623f0b7..0ccbcdf75000 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c @@ -49,7 +49,7 @@ struct radix_tree_node { unsigned int height; /* Height from the bottom */ unsigned int count; struct rcu_head rcu_head; - void *slots[RADIX_TREE_MAP_SIZE]; + void __rcu *slots[RADIX_TREE_MAP_SIZE]; unsigned long tags[RADIX_TREE_MAX_TAGS][RADIX_TREE_TAG_LONGS]; }; |