From 5d9f36b94db82fb630acdc38ac380af4cf107f8e Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Tue, 8 Jan 2013 08:48:42 +0400 Subject: xtensa: pull signal definitions from signal-defs.h This fixes the following build error in the current linux-next: include/linux/signal.h:261:2: error: unknown type name '__sigrestore_t' make[2]: *** [arch/xtensa/kernel/asm-offsets.s] Error 1 make[1]: *** [prepare0] Error 2 make: *** [sub-make] Error 2 that appeared after 32dae82 'consolidate kernel-side struct sigaction declarations' Signed-off-by: Max Filippov Signed-off-by: Chris Zankel --- arch/xtensa/include/uapi/asm/signal.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'arch/xtensa/include/uapi') diff --git a/arch/xtensa/include/uapi/asm/signal.h b/arch/xtensa/include/uapi/asm/signal.h index dacf716dd3e0..586756ee267a 100644 --- a/arch/xtensa/include/uapi/asm/signal.h +++ b/arch/xtensa/include/uapi/asm/signal.h @@ -102,16 +102,7 @@ typedef struct { #ifndef __ASSEMBLY__ -#define SIG_BLOCK 0 /* for blocking signals */ -#define SIG_UNBLOCK 1 /* for unblocking signals */ -#define SIG_SETMASK 2 /* for setting the signal mask */ - -/* Type of a signal handler. */ -typedef void (*__sighandler_t)(int); - -#define SIG_DFL ((__sighandler_t)0) /* default signal handling */ -#define SIG_IGN ((__sighandler_t)1) /* ignore signal */ -#define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ +#include #ifndef __KERNEL__ -- cgit v1.2.3 From 475c32d0a1b836fc3798ea96cc334a4bfffec2cf Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Sun, 23 Dec 2012 15:18:29 +0400 Subject: xtensa: add finit_module syscall Signed-off-by: Max Filippov Signed-off-by: Chris Zankel --- arch/xtensa/include/uapi/asm/unistd.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'arch/xtensa/include/uapi') diff --git a/arch/xtensa/include/uapi/asm/unistd.h b/arch/xtensa/include/uapi/asm/unistd.h index 5162418c5d90..7010caa1a234 100644 --- a/arch/xtensa/include/uapi/asm/unistd.h +++ b/arch/xtensa/include/uapi/asm/unistd.h @@ -728,8 +728,10 @@ __SYSCALL(330, sys_prlimit64, 4) #define __NR_kcmp 331 __SYSCALL(331, sys_kcmp, 5) +#define __NR_finit_module 332 +__SYSCALL(332, sys_finit_module, 3) -#define __NR_syscall_count 332 +#define __NR_syscall_count 333 /* * sysxtensa syscall handler -- cgit v1.2.3 From 9cf81c759b7db1db593b2ca60b74ec350d5f9205 Mon Sep 17 00:00:00 2001 From: Chris Zankel Date: Sat, 23 Feb 2013 19:09:57 -0800 Subject: xtensa: add accept4 syscall Signed-off-by: Chris Zankel --- arch/xtensa/include/uapi/asm/unistd.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'arch/xtensa/include/uapi') diff --git a/arch/xtensa/include/uapi/asm/unistd.h b/arch/xtensa/include/uapi/asm/unistd.h index 7010caa1a234..e10746335457 100644 --- a/arch/xtensa/include/uapi/asm/unistd.h +++ b/arch/xtensa/include/uapi/asm/unistd.h @@ -731,7 +731,10 @@ __SYSCALL(331, sys_kcmp, 5) #define __NR_finit_module 332 __SYSCALL(332, sys_finit_module, 3) -#define __NR_syscall_count 333 +#define __NR_accept4 333 +__SYSCALL(333, sys_accept4, 4) + +#define __NR_syscall_count 334 /* * sysxtensa syscall handler -- cgit v1.2.3