diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2019-09-11 15:51:18 +0300 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2019-09-15 22:37:14 +0300 |
| commit | a30cc14fe49c2d5913caf6b987d7cbd86c5e370b (patch) | |
| tree | 3cec2864162379e52d419f881cc9441adb139105 /arch | |
| parent | 278911ee89fa0f35127c0194010ffe2c17c2e3af (diff) | |
| download | linux-a30cc14fe49c2d5913caf6b987d7cbd86c5e370b.tar.xz | |
um: Don't use generic barrier.h
UML has its own platform-specific barrier.h under arch/x86/um/,
which should get used. Fix the build system to use it, and then
fix the barrier.h to actually compile.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/x86/um/asm/barrier.h | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild index b352ed09260e..398006d27e40 100644 --- a/arch/um/include/asm/Kbuild +++ b/arch/um/include/asm/Kbuild @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -generic-y += barrier.h generic-y += bpf_perf_event.h generic-y += bug.h generic-y += compat.h diff --git a/arch/x86/um/asm/barrier.h b/arch/x86/um/asm/barrier.h index f31e5d903161..eb0654f39fd2 100644 --- a/arch/x86/um/asm/barrier.h +++ b/arch/x86/um/asm/barrier.h @@ -2,14 +2,7 @@ #ifndef _ASM_UM_BARRIER_H_ #define _ASM_UM_BARRIER_H_ -#include <asm/asm.h> -#include <asm/segment.h> -#include <asm/cpufeatures.h> -#include <asm/cmpxchg.h> -#include <asm/nops.h> - -#include <linux/kernel.h> -#include <linux/irqflags.h> +#include <asm/alternative.h> /* * Force strict CPU ordering. |