dma_rmb() is added twice, because most architectures do not include asm-generic/barrier.h, but only asm/barrier.h. This should work with all architectures. dma_rmb() is used by the igb driver. Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx> --- backport/backport-include/asm-generic/barrier.h | 9 +++++++++ backport/backport-include/asm/barrier.h | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 backport/backport-include/asm-generic/barrier.h create mode 100644 backport/backport-include/asm/barrier.h diff --git a/backport/backport-include/asm-generic/barrier.h b/backport/backport-include/asm-generic/barrier.h new file mode 100644 index 0000000..9169449 --- /dev/null +++ b/backport/backport-include/asm-generic/barrier.h @@ -0,0 +1,9 @@ +#ifndef __BACKPORT_ASM_GENERIC_BARRIER_H +#define __BACKPORT_ASM_GENERIC_BARRIER_H +#include_next <asm-generic/barrier.h> + +#ifndef dma_rmb +#define dma_rmb() rmb() +#endif + +#endif /* __BACKPORT_ASM_GENERIC_BARRIER_H */ diff --git a/backport/backport-include/asm/barrier.h b/backport/backport-include/asm/barrier.h new file mode 100644 index 0000000..b04bd33 --- /dev/null +++ b/backport/backport-include/asm/barrier.h @@ -0,0 +1,9 @@ +#ifndef __BACKPORT_ASM_GENERIC_BARRIER_H +#define __BACKPORT_ASM_GENERIC_BARRIER_H +#include_next <asm/barrier.h> + +#ifndef dma_rmb +#define dma_rmb() rmb() +#endif + +#endif /* __BACKPORT_ASM_GENERIC_BARRIER_H */ -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe backports" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html