um: Don't use generic barrier.h · tjh.dev/kernel@a30cc14

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Johannes Berg and committed by

Richard Weinberger 6 years ago a30cc14f 278911ee

+1 -9

2 changed files

expand all

arch

include

asm

Kbuild

x86

asm

barrier.h

-1

arch/um/include/asm/Kbuild

··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 - generic-y += barrier.h 3 2 generic-y += bpf_perf_event.h 4 3 generic-y += bug.h 5 4 generic-y += compat.h

+1 -8

arch/x86/um/asm/barrier.h

··· 2 2 #ifndef _ASM_UM_BARRIER_H_ 3 3 #define _ASM_UM_BARRIER_H_ 4 4 5 - #include <asm/asm.h> 6 - #include <asm/segment.h> 7 - #include <asm/cpufeatures.h> 8 - #include <asm/cmpxchg.h> 9 - #include <asm/nops.h> 10 - 11 - #include <linux/kernel.h> 12 - #include <linux/irqflags.h> 5 + #include <asm/alternative.h> 13 6 14 7 /* 15 8 * Force strict CPU ordering.