aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um')
-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 @@
8 8
9#include <signal.h> 9#include <signal.h>
10 10
11/* Copied from linux/compiler-gcc.h since we can't include it directly */
12#define barrier() __asm__ __volatile__("": : :"memory")
13
14extern void sig_handler(int sig, struct sigcontext *sc); 11extern void sig_handler(int sig, struct sigcontext *sc);
15extern void alarm_handler(int sig, struct sigcontext *sc); 12extern void alarm_handler(int sig, struct sigcontext *sc);
16 13
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);
40extern size_t strlcpy(char *, const char *, size_t); 40extern size_t strlcpy(char *, const char *, size_t);
41extern size_t strlcat(char *, const char *, size_t); 41extern size_t strlcat(char *, const char *, size_t);
42 42
43/* Copied from linux/compiler-gcc.h since we can't include it directly */
44#define barrier() __asm__ __volatile__("": : :"memory")
45
43#endif 46#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 @@
16#include "sysdep/barrier.h" 16#include "sysdep/barrier.h"
17#include "sysdep/sigcontext.h" 17#include "sysdep/sigcontext.h"
18 18
19/* Copied from linux/compiler-gcc.h since we can't include it directly */
20#define barrier() __asm__ __volatile__("": : :"memory")
21
22void (*sig_info[NSIG])(int, struct uml_pt_regs *) = { 19void (*sig_info[NSIG])(int, struct uml_pt_regs *) = {
23 [SIGTRAP] = relay_signal, 20 [SIGTRAP] = relay_signal,
24 [SIGFPE] = relay_signal, 21 [SIGFPE] = relay_signal,