summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2019-09-11 14:51:18 +0200
committerRichard Weinberger <richard@nod.at>2019-09-15 21:37:14 +0200
commita30cc14fe49c2d5913caf6b987d7cbd86c5e370b (patch)
tree3cec2864162379e52d419f881cc9441adb139105 /arch/um
parentum: time-travel: Restrict time update in IRQ handler (diff)
downloadlinux-a30cc14fe49c2d5913caf6b987d7cbd86c5e370b.tar.xz
linux-a30cc14fe49c2d5913caf6b987d7cbd86c5e370b.zip
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/um')
-rw-r--r--arch/um/include/asm/Kbuild1
1 files changed, 0 insertions, 1 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