diff --git a/[refs] b/[refs] index 241c13632012..5d30f08f23da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d36cc701b28983ea2c8d80afe68aae5452aea3bf +refs/heads/master: d1b88eb9e3bccaa43fb5d1bde1cbe210b3434731 diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h index ffe24c09e53d..abf44d89c6ce 100644 --- a/trunk/include/linux/rcupdate.h +++ b/trunk/include/linux/rcupdate.h @@ -903,7 +903,9 @@ static inline notrace void rcu_read_unlock_sched_notrace(void) * the reader-accessible portions of the linked structure. */ #define RCU_INIT_POINTER(p, v) \ - p = (typeof(*v) __force __rcu *)(v) + do { \ + p = (typeof(*v) __force __rcu *)(v); \ + } while (0) /** * RCU_POINTER_INITIALIZER() - statically initialize an RCU protected pointer