asm/barrier.h was created in kernel version 3.4, before that version the code was in asm/atomic.h. Include it so we can add code to asm/barrier.h and use it also in kernel < 3.4.
Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de> --- backport/backport-include/asm/atomic.h | 1 + backport/backport-include/asm/barrier.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/backport/backport-include/asm/atomic.h b/backport/backport-include/asm/atomic.h index c2a46d2..9f3543c 100644 --- a/backport/backport-include/asm/atomic.h +++ b/backport/backport-include/asm/atomic.h @@ -2,6 +2,7 @@ #define __BACKPORT_ASM_ATOMIC_H #include_next <asm/atomic.h> #include <linux/version.h> +#include <asm/barrier.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0) /* diff --git a/backport/backport-include/asm/barrier.h b/backport/backport-include/asm/barrier.h index 3eb7372..7ccf57c 100644 --- a/backport/backport-include/asm/barrier.h +++ b/backport/backport-include/asm/barrier.h @@ -1,6 +1,10 @@ #ifndef __BACKPORT_ASM_BARRIER_H #define __BACKPORT_ASM_BARRIER_H + +#include <linux/version.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) #include_next <asm/barrier.h> +#endif /* >= 3.4 */ #ifndef dma_rmb #define dma_rmb() rmb() -- 2.6.2 -- To unsubscribe from this list: send the line "unsubscribe backports" in
