1 files changed, 1 insertions, 9 deletions
diff --git a/kernel/rcupreempt.c b/kernel/rcupreempt.c
index 27827931ca0d..59236e8b9daa 100644
--- a/kernel/rcupreempt.c
+++ b/kernel/rcupreempt.c
@@ -54,17 +54,9 @@
 #include <linux/cpu.h>
 #include <linux/random.h>
 #include <linux/delay.h>
-#include <linux/byteorder/swabb.h>
 #include <linux/cpumask.h>
 #include <linux/rcupreempt_trace.h>
+#include <asm/byteorder.h>
-/*
- * Macro that prevents the compiler from reordering accesses, but does
- * absolutely -nothing- to prevent CPUs from reordering.  This is used
- * only to mediate communication between mainline code and hardware
- * interrupt and NMI handlers.
- */
-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
 /*
 * PREEMPT_RCU data structures.

diff --git a/kernel/rcupreempt.c b/kernel/rcupreempt.c index 27827931ca0d..59236e8b9daa 100644 --- a/kernel/rcupreempt.c +++ b/kernel/rcupreempt.c
@@ -54,17 +54,9 @@
54	#include <linux/cpu.h>	54	#include <linux/cpu.h>
55	#include <linux/random.h>	55	#include <linux/random.h>
56	#include <linux/delay.h>	56	#include <linux/delay.h>
57	#include <linux/byteorder/swabb.h>
58	#include <linux/cpumask.h>	57	#include <linux/cpumask.h>
59	#include <linux/rcupreempt_trace.h>	58	#include <linux/rcupreempt_trace.h>
60		59	#include <asm/byteorder.h>
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		60
69	/*	61	/*
70	* PREEMPT_RCU data structures.	62	* PREEMPT_RCU data structures.