Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-12 16:19:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

um: take userland definition of barrier() to user.h

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Al Viro 2011-08-18 20:04:59 +01:00 committed by Richard Weinberger
parent dd768c56da
commit 05c46db4d7
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/um/include/shared/process.h
View File

@ -8,9 +8,6 @@
#include <signal.h> #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 sig_handler(int sig, struct sigcontext *sc);
extern void alarm_handler(int sig, struct sigcontext *sc); extern void alarm_handler(int sig, struct sigcontext *sc);

3
arch/um/include/shared/user.h
View File

@ -40,4 +40,7 @@ extern int in_aton(char *str);
extern size_t strlcpy(char *, const char *, size_t); extern size_t strlcpy(char *, const char *, size_t);
extern size_t strlcat(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 #endif

3
arch/um/os-Linux/signal.c
View File

@ -16,9 +16,6 @@
#include "sysdep/barrier.h" #include "sysdep/barrier.h"
#include "sysdep/sigcontext.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 *) = { void (*sig_info[NSIG])(int, struct uml_pt_regs *) = {
[SIGTRAP] = relay_signal, [SIGTRAP] = relay_signal,
[SIGFPE] = relay_signal, [SIGFPE] = relay_signal,