Commit a30cc14f authored by Johannes Berg's avatar Johannes Berg Committed by Richard Weinberger
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 278911ee

arch/um/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

generic-y += barrier.h

generic-y += bpf_perf_event.h

generic-y += bug.h

generic-y += compat.h

arch/x86/um/asm/barrier.h

+1 −8
Original line number Diff line number Diff line
@@ -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.

CRA Git | Maintained and supported by SUSTech CRA and CCSE