diff --git a/[refs] b/[refs] index f57c3dd19d9e..84dff56ddb3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5155b33277c9678041a27869165619bb34f722f +refs/heads/master: 71d1d5c722db9ae3b3f9c08ef7ddcd7759fbb1e0 diff --git a/trunk/include/linux/compiler.h b/trunk/include/linux/compiler.h index a5a472b10746..c1a62c56a660 100644 --- a/trunk/include/linux/compiler.h +++ b/trunk/include/linux/compiler.h @@ -16,6 +16,7 @@ # define __release(x) __context__(x,-1) # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0) # define __percpu __attribute__((noderef, address_space(3))) +# define __rcu extern void __chk_user_ptr(const volatile void __user *); extern void __chk_io_ptr(const volatile void __iomem *); #else @@ -34,6 +35,7 @@ extern void __chk_io_ptr(const volatile void __iomem *); # define __release(x) (void)0 # define __cond_lock(x,c) (c) # define __percpu +# define __rcu #endif #ifdef __KERNEL__