Commit ded00a56e99555c3f4000ef3eebfd5fe0d574565

Authored by Paul E. McKenney
Committed by Ingo Molnar
1 parent cd95851785

rcu: remove redundant ACCESS_ONCE definition from rcupreempt.c

Remove the redundant definition of ACCESS_ONCE() from rcupreempt.c in
favor of the one in compiler.h.  Also merge the comment header from
rcupreempt.c's definition into that in compiler.h.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 2 changed files with 3 additions and 9 deletions Side-by-side Diff

include/linux/compiler.h
... ... @@ -190,7 +190,9 @@
190 190 * ACCESS_ONCE() in different C statements.
191 191 *
192 192 * This macro does absolutely -nothing- to prevent the CPU from reordering,
193   - * merging, or refetching absolutely anything at any time.
  193 + * merging, or refetching absolutely anything at any time. Its main intended
  194 + * use is to mediate communication between process-level code and irq/NMI
  195 + * handlers, all running on the same CPU.
194 196 */
195 197 #define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
196 198  
... ... @@ -59,14 +59,6 @@
59 59 #include <linux/rcupreempt_trace.h>
60 60  
61 61 /*
62   - * Macro that prevents the compiler from reordering accesses, but does
63   - * absolutely -nothing- to prevent CPUs from reordering. This is used
64   - * only to mediate communication between mainline code and hardware
65   - * interrupt and NMI handlers.
66   - */
67   -#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
68   -
69   -/*
70 62 * PREEMPT_RCU data structures.
71 63 */
72 64