From dbab4efadaad00168d86c7318df9ebee7855844f Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 18 Aug 2011 20:04:59 +0100 Subject: [PATCH] --- yaml --- r: 273008 b: refs/heads/master c: 05c46db4d7d51af969e09f9f1adbff66ee2e84b4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/include/shared/process.h | 3 --- trunk/arch/um/include/shared/user.h | 3 +++ trunk/arch/um/os-Linux/signal.c | 3 --- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 6375d1ec8031..3bbe8f97de58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd768c56da44f6c06486da3b33b41e9c13e985c5 +refs/heads/master: 05c46db4d7d51af969e09f9f1adbff66ee2e84b4 diff --git a/trunk/arch/um/include/shared/process.h b/trunk/arch/um/include/shared/process.h index bb873a51262e..28215300fc69 100644 --- a/trunk/arch/um/include/shared/process.h +++ b/trunk/arch/um/include/shared/process.h @@ -8,9 +8,6 @@ #include -/* 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/trunk/arch/um/include/shared/user.h b/trunk/arch/um/include/shared/user.h index 58c058165e00..4fa82c055aab 100644 --- a/trunk/arch/um/include/shared/user.h +++ b/trunk/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/trunk/arch/um/os-Linux/signal.c b/trunk/arch/um/os-Linux/signal.c index c4a4e2026630..08d306176995 100644 --- a/trunk/arch/um/os-Linux/signal.c +++ b/trunk/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,