From: Luca Coelho <luciano.coelho@xxxxxxxxx> The smp_mb__after_atomic definition is in barrier.h in the mainline, but we currently include the backport in atomic.h. This may cause problems with certain include chain combinations. Move it to the correct place. Signed-off-by: Luca Coelho <luciano.coelho@xxxxxxxxx> Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx> --- backport/backport-include/asm/atomic.h | 4 ---- backport/backport-include/asm/barrier.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backport/backport-include/asm/atomic.h b/backport/backport-include/asm/atomic.h index 9f3543c..d5148f0 100644 --- a/backport/backport-include/asm/atomic.h +++ b/backport/backport-include/asm/atomic.h @@ -16,8 +16,4 @@ #endif #endif -#ifndef smp_mb__after_atomic -#define smp_mb__after_atomic smp_mb__after_clear_bit -#endif - #endif /* __BACKPORT_ASM_ATOMIC_H */ diff --git a/backport/backport-include/asm/barrier.h b/backport/backport-include/asm/barrier.h index 7ccf57c..423a581 100644 --- a/backport/backport-include/asm/barrier.h +++ b/backport/backport-include/asm/barrier.h @@ -10,4 +10,8 @@ #define dma_rmb() rmb() #endif +#ifndef smp_mb__after_atomic +#define smp_mb__after_atomic smp_mb__after_clear_bit +#endif + #endif /* __BACKPORT_ASM_BARRIER_H */ -- 2.6.2 -- To unsubscribe from this list: send the line "unsubscribe backports" in
