diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 15:04:59 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2011-11-02 09:14:58 -0400 |
commit | 05c46db4d7d51af969e09f9f1adbff66ee2e84b4 (patch) | |
tree | ade36b7da93e8e297a40312cd5047196ab8dccd5 /arch/um/include | |
parent | dd768c56da44f6c06486da3b33b41e9c13e985c5 (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>
Diffstat (limited to 'arch/um/include')
-rw-r--r-- | arch/um/include/shared/process.h | 3 | ||||
-rw-r--r-- | arch/um/include/shared/user.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/include/shared/process.h b/arch/um/include/shared/process.h index bb873a51262..28215300fc6 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 | |||
14 | extern void sig_handler(int sig, struct sigcontext *sc); | 11 | extern void sig_handler(int sig, struct sigcontext *sc); |
15 | extern void alarm_handler(int sig, struct sigcontext *sc); | 12 | extern 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 58c058165e0..4fa82c055aa 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); | |||
40 | extern size_t strlcpy(char *, const char *, size_t); | 40 | extern size_t strlcpy(char *, const char *, size_t); |
41 | extern size_t strlcat(char *, const char *, size_t); | 41 | extern 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 |