diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c index 4d31688b22b3e50fc512715eb5314bd5881955fa..2d22f1fcd8e244269ed0e55c7c25e0f09a3b7e8a 100644 --- a/arch/um/os-Linux/signal.c +++ b/arch/um/os-Linux/signal.c @@ -12,7 +12,6 @@ #include "as-layout.h" #include "kern_util.h" #include "os.h" -#include "sysdep/barrier.h" #include "sysdep/mcontext.h" void (*sig_info[NSIG])(int, struct uml_pt_regs *) = { diff --git a/arch/um/sys-x86/shared/sysdep/barrier.h b/arch/um/sys-x86/shared/sysdep/barrier.h deleted file mode 100644 index 89ee23bc8da4f95b5ff1cfe5b22025fb573d391d..0000000000000000000000000000000000000000 --- a/arch/um/sys-x86/shared/sysdep/barrier.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __i386__ -#include "barrier_32.h" -#else -#include "barrier_64.h" -#endif diff --git a/arch/um/sys-x86/shared/sysdep/barrier_32.h b/arch/um/sys-x86/shared/sysdep/barrier_32.h deleted file mode 100644 index b58d52c5b2f4777fae8b53beb31c4535dc3e6317..0000000000000000000000000000000000000000 --- a/arch/um/sys-x86/shared/sysdep/barrier_32.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef __SYSDEP_I386_BARRIER_H -#define __SYSDEP_I386_BARRIER_H - -/* Copied from include/asm-i386 for use by userspace. i386 has the option - * of using mfence, but I'm just using this, which works everywhere, for now. - */ -#define mb() asm volatile("lock; addl $0,0(%esp)") - -#endif diff --git a/arch/um/sys-x86/shared/sysdep/barrier_64.h b/arch/um/sys-x86/shared/sysdep/barrier_64.h deleted file mode 100644 index 7b610befdc8f3521bd13c598034847fc1d680616..0000000000000000000000000000000000000000 --- a/arch/um/sys-x86/shared/sysdep/barrier_64.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __SYSDEP_X86_64_BARRIER_H -#define __SYSDEP_X86_64_BARRIER_H - -/* Copied from include/asm-x86_64 for use by userspace. */ -#define mb() asm volatile("mfence":::"memory") - -#endif