From b5d7b1e47e89ae49b81e2e0c035b0a7d7851bc54 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Wed, 16 May 2012 15:51:08 -0700 Subject: [PATCH] --- yaml --- r: 312187 b: refs/heads/master c: e9023c4061054cbf59c5288068118a4d0b152f01 h: refs/heads/master i: 312185: bdaaca7828f69f598a9c7c9237556e6d77c2c2e9 312183: 27c55fed65bc9a61467032ef44e35270004ff239 v: v3 --- [refs] | 2 +- trunk/include/linux/rcupdate.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e949d9c9f366..69858e31b1c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5c1f444d28b1a9eaf9c3927041db0414f684ef4 +refs/heads/master: e9023c4061054cbf59c5288068118a4d0b152f01 diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h index abf44d89c6ce..fb8e6db511d7 100644 --- a/trunk/include/linux/rcupdate.h +++ b/trunk/include/linux/rcupdate.h @@ -513,10 +513,10 @@ static inline void rcu_preempt_sleep_check(void) (_________p1); \ }) #define __rcu_assign_pointer(p, v, space) \ - ({ \ + do { \ smp_wmb(); \ (p) = (typeof(*v) __force space *)(v); \ - }) + } while (0) /** @@ -851,7 +851,7 @@ static inline notrace void rcu_read_unlock_sched_notrace(void) * * Assigns the specified value to the specified RCU-protected * pointer, ensuring that any concurrent RCU readers will see - * any prior initialization. Returns the value assigned. + * any prior initialization. * * Inserts memory barriers on architectures that require them * (which is most of them), and also prevents the compiler from