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>
mariux64 · Nov 2, 2011 · 05c46db · 05c46db
1 parent dd768c5
commit 05c46db
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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,