summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2011-08-18 20:05:39 +0100
committerRichard Weinberger <richard@nod.at>2011-11-02 14:15:01 +0100
commit62982ad6b013a35c2e49caab2b90855d3ad4531d (patch)
treea382ec74d4f9d6762c86eae92fb2a4e31d7c6301
parent0de021f797e7bd785796071aab8e14827c87d6bf (diff)
um: sysdep/barrier.h is not used for anything
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
-rw-r--r--arch/um/os-Linux/signal.c1
-rw-r--r--arch/um/sys-x86/shared/sysdep/barrier.h5
-rw-r--r--arch/um/sys-x86/shared/sysdep/barrier_32.h9
-rw-r--r--arch/um/sys-x86/shared/sysdep/barrier_64.h7
4 files changed, 0 insertions, 22 deletions
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index 4d31688b22b..2d22f1fcd8e 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 89ee23bc8da..00000000000
--- 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 b58d52c5b2f..00000000000
--- 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 7b610befdc8..00000000000
--- 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