byteorder: fix direct byteswap includes
Subsystems (2)
PATCH 4/5 byteorder: fix direct byteswap includes
--- drivers/media/dvb/ttpci/av7110.c | 2 +- drivers/media/video/cx18/cx18-driver.h | 2 +- drivers/media/video/ivtv/ivtv-driver.h | 2 +- drivers/media/video/vpx3220.c | 2 +- kernel/rcupreempt.c | 2 +- kernel/rcutorture.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
drivers/media/dvb/ttpci/av7110.c +1 -1
@@ -36,7 +36,6 @@#include <linux/fs.h> #include <linux/timer.h> #include <linux/poll.h> -#include <linux/byteorder/swabb.h> #include <linux/smp_lock.h> #include <linux/kernel.h>
@@ -53,6 +52,7 @@#include <linux/kthread.h> #include <asm/unaligned.h> +#include <asm/byteorder.h> #include <asm/system.h> #include <linux/dvb/frontend.h>
drivers/media/video/cx18/cx18-driver.h +1 -1
@@ -38,10 +38,10 @@#include <linux/i2c-algo-bit.h> #include <linux/list.h> #include <linux/unistd.h> -#include <linux/byteorder/swab.h> #include <linux/pagemap.h> #include <linux/workqueue.h> #include <linux/mutex.h> +#include <asm/byteorder.h> #include <linux/dvb/video.h> #include <linux/dvb/audio.h>
drivers/media/video/ivtv/ivtv-driver.h +1 -1
@@ -49,11 +49,11 @@#include <linux/i2c-algo-bit.h> #include <linux/list.h> #include <linux/unistd.h> -#include <linux/byteorder/swab.h> #include <linux/pagemap.h> #include <linux/scatterlist.h> #include <linux/workqueue.h> #include <linux/mutex.h> +#include <asm/byteorder.h> #include <asm/uaccess.h> #include <asm/system.h>
drivers/media/video/vpx3220.c +1 -1
@@ -24,7 +24,7 @@#include <linux/types.h> #include <linux/slab.h> -#include <linux/byteorder/swab.h> +#include <asm/byteorder.h> #include <asm/io.h> #include <asm/uaccess.h>
kernel/rcupreempt.c +1 -1
@@ -54,9 +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
kernel/rcutorture.c +1 -1
@@ -42,10 +42,10 @@#include <linux/freezer.h> #include <linux/cpu.h> #include <linux/delay.h> -#include <linux/byteorder/swabb.h> #include <linux/stat.h> #include <linux/srcu.h> #include <linux/slab.h> +#include <asm/byteorder.h> MODULE_LICENSE ("GPL" ); MODULE_AUTHOR("Paul E. McKenney <[email protected]> and "
Signature · 1 line
1.5.6.1.281.g1087e
Quoted 1 line · Harvey Harrison
+#include <
asm/byteorder.h>
Please use <linux/byteorder.h> rather than <asm/byteorder.h> when including stuff from .c files outside the include and arch directories.
And whilst you're at it, Documentation/byteorder.txt is yours for the creation:-)
David
Quoted 6 lines · David Howells
Quoted 1 line · Harvey Harrison
+#include <
asm/byteorder.h>Please use <
linux/byteorder.h> rather than <asm/byteorder.h> when including stuff from .c files outside the include and arch directories.
asm/byteorder.h is the file included everywhere else, and before my patches, linux/byteorder.h didn't even exist. Thus, when preparing my patches I made sure that including asm/byteorder.h continued to be the way to get this functionality.
I could add another patch on top that makes linux/byteorder the one we want included and search/replace the existing asm includes, but I thought that was a bit too big to do in one go.
If people think this is the way to go, I'll prepare a patch to change the includes.
Quoted 2 lines
And whilst you're at it,
Documentation/byteorder.txtis yours for the creation:-)
Already working on an update to unaligned_access.txt, I'll get to byteorder next.
Harvey