Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a30cc14f authored Sep 11, 2019 by Johannes Berg Committed by Richard Weinberger Sep 15, 2019

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>

parent 278911ee

arch/um/include/asm/Kbuild

+0 −1

Original line number	Original line	Diff line number	Diff line
	# SPDX-License-Identifier: GPL-2.0		# SPDX-License-Identifier: GPL-2.0
	generic-y += barrier.h
	generic-y += bpf_perf_event.h		generic-y += bpf_perf_event.h
	generic-y += bug.h		generic-y += bug.h
	generic-y += compat.h		generic-y += compat.h

arch/x86/um/asm/barrier.h

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -2,14 +2,7 @@
	#ifndef _ASM_UM_BARRIER_H_		#ifndef _ASM_UM_BARRIER_H_
	#define _ASM_UM_BARRIER_H_		#define _ASM_UM_BARRIER_H_

	#include <asm/asm.h>		#include <asm/alternative.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>

	/*		/*
	* Force strict CPU ordering.		* Force strict CPU ordering.