summaryrefslogtreecommitdiffstats
path: root/include/linux/radix-tree.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2010-02-25 23:43:52 +0100
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2010-08-19 17:18:03 -0700
commita1115570b31091f3e3ab9e6cf7ee8d320a42be84 (patch)
tree1253b42dd3348fb733fdf51bcf30f1abf1388b19 /include/linux/radix-tree.h
parent374a8e0dc33c984fac284de7d57d77af3cfdbfb7 (diff)
downloadop-kernel-dev-a1115570b31091f3e3ab9e6cf7ee8d320a42be84.zip
op-kernel-dev-a1115570b31091f3e3ab9e6cf7ee8d320a42be84.tar.gz
radix-tree: __rcu annotations
Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Nick Piggin <npiggin@suse.de> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'include/linux/radix-tree.h')
-rw-r--r--include/linux/radix-tree.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
index 634b8e6..a39cbed 100644
--- a/include/linux/radix-tree.h
+++ b/include/linux/radix-tree.h
@@ -47,6 +47,8 @@ static inline void *radix_tree_indirect_to_ptr(void *ptr)
{
return (void *)((unsigned long)ptr & ~RADIX_TREE_INDIRECT_PTR);
}
+#define radix_tree_indirect_to_ptr(ptr) \
+ radix_tree_indirect_to_ptr((void __force *)(ptr))
static inline int radix_tree_is_indirect_ptr(void *ptr)
{
@@ -61,7 +63,7 @@ static inline int radix_tree_is_indirect_ptr(void *ptr)
struct radix_tree_root {
unsigned int height;
gfp_t gfp_mask;
- struct radix_tree_node *rnode;
+ struct radix_tree_node __rcu *rnode;
};
#define RADIX_TREE_INIT(mask) { \
OpenPOWER on IntegriCloud