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>

diff --git a/arch/um/include/shared/process.h b/arch/um/include/shared/process.h
index bb873a51262e5a6707ae434e478b9bc13cbfe413..28215300fc6985f0b5baa44bc4a27daded3e3979 100644 (file)
--- 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 58c058165e00ed9d70037ca209523b70b9145f08..4fa82c055aab8d53576b06787aa1033644a16697 100644 (file)
--- 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 c4a4e20266304881b496a161ec00153c342d9caf..08d30617699589f7becf333381d0643c468cef25 100644 (file)
--- 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,