Replace <asm/system.h> with <asm/barrier.h>

Added a compatibility header for <asm/barrier.h> which is being added in
kernel version 3.4, along with the removal of <asm/system.h>.

Changed C files that previously included <asm/system.h> to include
<asm/barrier.h> instead.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>

diff --git a/comedi/drivers.c b/comedi/drivers.c
index 4eed3671d4071ca866c77e0a02771f5015c7fc3c..27c34fe7bc196c1fcc66480a08816a5e01766c3e 100644 (file)
--- a/comedi/drivers.c
+++ b/comedi/drivers.c
@@ -44,7 +44,7 @@
 #include <linux/dma-mapping.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
+#include <asm/barrier.h>
 
 #include "comedi_fops.h"
 

diff --git a/comedi/drivers/cb_pcidas64.c b/comedi/drivers/cb_pcidas64.c
index 3cb2e4b35081fabc16e1357b7b03976a6a2b73b6..2cf2ac6f9da5b0964c0b13b0de25c375418270de 100644 (file)
--- a/comedi/drivers/cb_pcidas64.c
+++ b/comedi/drivers/cb_pcidas64.c
@@ -85,7 +85,7 @@ TODO:
 
 #include <linux/comedidev.h>
 #include <linux/delay.h>
-#include <asm/system.h>
+#include <asm/barrier.h>
 
 #include "comedi_pci.h"
 #include "8253.h"

diff --git a/comedi/drivers/mite.c b/comedi/drivers/mite.c
index 962b364ae41a38302fc8c2960db1d94f30dddc9c..d1772e72fd7b7c80e56433ff79c7643e90a36e9f 100644 (file)
--- a/comedi/drivers/mite.c
+++ b/comedi/drivers/mite.c
@@ -55,7 +55,7 @@
 #include "comedi_pci.h"
 #include <linux/comedidev.h>
 
-#include <asm/system.h>
+#include <asm/barrier.h>
 
 #define PCI_MITE_SIZE          4096
 #define PCI_DAQ_SIZE           4096

diff --git a/include/asm/barrier.h b/include/asm/barrier.h
new file mode 100644 (file)
index 0000000..d91fd54
--- /dev/null
+++ b/include/asm/barrier.h
@@ -0,0 +1,16 @@
+/*
+ * asm/barrier.h compatibility header
+ */
+
+#ifndef __COMPAT_ASM_BARRIER_H_
+#define __COMPAT_ASM_BARRIER_H_
+
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
+#include <asm/system.h>
+#else
+#include_next <asm/barrier.h>
+#endif
+
+#endif /* __COMPAT_ASM_BARRIER_H_ */