Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05c46db4 authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

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



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent dd768c56

arch/um/include/shared/process.h

+0 −3
Original line number Diff line number Diff line
@@ -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);

arch/um/include/shared/user.h

+3 −0
Original line number Diff line number Diff line
@@ -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

arch/um/os-Linux/signal.c

+0 −3
Original line number Diff line number Diff line
@@ -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,