diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2015-12-21 09:22:18 +0200 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-11 10:57:47 +0200 |
| commit | dcd84e11fcad676587ea028b664956de415740ff (patch) | |
| tree | dd8500796596617a83aac567c073c39d9acd43ed /arch | |
| parent | 77ed79ad96e3a302dbc704a91a97b01139846169 (diff) | |
x86/um: reuse asm-generic/barrier.h
commit 577f183acc88645eae116326cc2203dc88ea730c upstream.
On x86/um CONFIG_SMP is never defined. As a result, several macros
match the asm-generic variant exactly. Drop the local definitions and
pull in asm-generic/barrier.h instead.
This is in preparation to refactoring this code area.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Richard Weinberger <richard@nod.at>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/um/asm/barrier.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/um/asm/barrier.h b/arch/x86/um/asm/barrier.h index 7d01b8c56..1da6bb44f 100644 --- a/arch/x86/um/asm/barrier.h +++ b/arch/x86/um/asm/barrier.h @@ -51,11 +51,7 @@ #else /* CONFIG_SMP */ -#define smp_mb() barrier() -#define smp_rmb() barrier() -#define smp_wmb() barrier() -#define smp_read_barrier_depends() do { } while (0) -#define set_mb(var, value) do { var = value; barrier(); } while (0) +#include <asm-generic/barrier.h> #endif /* CONFIG_SMP */ |