Messages in this thread | | | Date | Mon, 13 Jan 2014 14:26:42 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with the xtensa tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in arch/xtensa/include/asm/barrier.h between commit dbacef090841 ("xtensa: add SMP support") from the xtensa tree and commit 93ea02bb8435 ("arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h") from the tip tree.
I fixed it up (I am pretty sure - see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/xtensa/include/asm/barrier.h index 8e5e5c980a7a,e1ee6b51dfc5..000000000000 --- a/arch/xtensa/include/asm/barrier.h +++ b/arch/xtensa/include/asm/barrier.h @@@ -16,16 -13,10 +13,6 @@@ #define rmb() barrier() #define wmb() mb() --#ifdef CONFIG_SMP - #define smp_mb() mb() - #define smp_rmb() rmb() - #define smp_wmb() wmb() - #else - #define smp_mb() barrier() - #define smp_rmb() barrier() - #define smp_wmb() barrier() -#error smp_* not defined --#endif -- - #define set_mb(var, value) do { var = value; mb(); } while (0) + #include <asm-generic/barrier.h> #endif /* _XTENSA_SYSTEM_H */ [unhandled content-type:application/pgp-signature] | |