summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2011-08-18 20:04:59 +0100
committerRichard Weinberger <richard@nod.at>2011-11-02 14:14:58 +0100
commit05c46db4d7d51af969e09f9f1adbff66ee2e84b4 (patch)
treeade36b7da93e8e297a40312cd5047196ab8dccd5
parentdd768c56da44f6c06486da3b33b41e9c13e985c5 (diff)
um: take userland definition of barrier() to user.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
-rw-r--r--arch/um/include/shared/process.h3
-rw-r--r--arch/um/include/shared/user.h3
-rw-r--r--arch/um/os-Linux/signal.c3
3 files changed, 3 insertions, 6 deletions
diff --git a/arch/um/include/shared/process.h b/arch/um/include/shared/process.h
index bb873a51262e..28215300fc69 100644
--- a/arch/um/include/shared/process.h
+++ b/arch/um/include/shared/process.h
@@ -8,9 +8,6 @@
#include <signal.h>
-/* Copied from linux/compiler-gcc.h since we can't include it directly */
-#define barrier() __asm__ __volatile__("": : :"memory")
-
extern void sig_handler(int sig, struct sigcontext *sc);
extern void alarm_handler(int sig, struct sigcontext *sc);
diff --git a/arch/um/include/shared/user.h b/arch/um/include/shared/user.h
index 58c058165e00..4fa82c055aab 100644
--- a/arch/um/include/shared/user.h
+++ b/arch/um/include/shared/user.h
@@ -40,4 +40,7 @@ extern int in_aton(char *str);
extern size_t strlcpy(char *, const char *, size_t);
extern size_t strlcat(char *, const char *, size_t);
+/* Copied from linux/compiler-gcc.h since we can't include it directly */
+#define barrier() __asm__ __volatile__("": : :"memory")
+
#endif
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index c4a4e2026630..08d306176995 100644
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -16,9 +16,6 @@
#include "sysdep/barrier.h"
#include "sysdep/sigcontext.h"
-/* Copied from linux/compiler-gcc.h since we can't include it directly */
-#define barrier() __asm__ __volatile__("": : :"memory")
-
void (*sig_info[NSIG])(int, struct uml_pt_regs *) = {
[SIGTRAP] = relay_signal,
[SIGFPE] = relay_signal,