From 16c7659deaa988f32434c4a1952f2685d0d13b32 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Fri, 12 Jun 2009 10:26:48 +0200 Subject: [PATCH] --- yaml --- r: 148781 b: refs/heads/master c: fc39453debac927a3ba477bafbc6c18c7166ae78 h: refs/heads/master i: 148779: 8f49def397e77ab07bb40ae8ae92017fac73d059 v: v3 --- [refs] | 2 +- trunk/arch/s390/include/asm/unistd.h | 3 ++- trunk/arch/s390/kernel/compat_wrapper.S | 8 ++++++++ trunk/arch/s390/kernel/syscalls.S | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 05562b1918d3..d1a682fba7a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bf1226b33dc2f94fc37ffd70ee161e2bda1ff5c +refs/heads/master: fc39453debac927a3ba477bafbc6c18c7166ae78 diff --git a/trunk/arch/s390/include/asm/unistd.h b/trunk/arch/s390/include/asm/unistd.h index f0f19e6ace6c..90557237172b 100644 --- a/trunk/arch/s390/include/asm/unistd.h +++ b/trunk/arch/s390/include/asm/unistd.h @@ -267,7 +267,8 @@ #define __NR_epoll_create1 327 #define __NR_preadv 328 #define __NR_pwritev 329 -#define NR_syscalls 330 +#define __NR_rt_tgsigqueueinfo 330 +#define NR_syscalls 331 /* * There are some system calls that are not present on 64 bit, some diff --git a/trunk/arch/s390/kernel/compat_wrapper.S b/trunk/arch/s390/kernel/compat_wrapper.S index fb38af6316bb..d2e7fbf5d65d 100644 --- a/trunk/arch/s390/kernel/compat_wrapper.S +++ b/trunk/arch/s390/kernel/compat_wrapper.S @@ -1823,3 +1823,11 @@ compat_sys_pwritev_wrapper: llgfr %r5,%r5 # u32 llgfr %r6,%r6 # u32 jg compat_sys_pwritev # branch to system call + + .globl compat_sys_rt_tgsigqueueinfo_wrapper +compat_sys_rt_tgsigqueueinfo_wrapper: + lgfr %r2,%r2 # compat_pid_t + lgfr %r3,%r3 # compat_pid_t + lgfr %r4,%r4 # int + llgtr %r5,%r5 # struct compat_siginfo * + jg compat_sys_rt_tgsigqueueinfo_wrapper # branch to system call diff --git a/trunk/arch/s390/kernel/syscalls.S b/trunk/arch/s390/kernel/syscalls.S index 2c7739fe70b1..82f89ef87d2e 100644 --- a/trunk/arch/s390/kernel/syscalls.S +++ b/trunk/arch/s390/kernel/syscalls.S @@ -338,3 +338,4 @@ SYSCALL(sys_dup3,sys_dup3,sys_dup3_wrapper) SYSCALL(sys_epoll_create1,sys_epoll_create1,sys_epoll_create1_wrapper) SYSCALL(sys_preadv,sys_preadv,compat_sys_preadv_wrapper) SYSCALL(sys_pwritev,sys_pwritev,compat_sys_pwritev_wrapper) +SYSCALL(sys_rt_tgsigqueueinfo,sys_rt_tgsigqueueinfo,compat_sys_rt_tgsigqueueinfo_wrapper) /* 330 */