From 8f9e9c4390195301016e3d0c4b4cb9ea2a5758dc Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Wed, 23 Mar 2011 10:15:57 +0100 Subject: [PATCH] --- yaml --- r: 242485 b: refs/heads/master c: 26e8a33989183e81d6692aec1a77dffa266b91a2 h: refs/heads/master i: 242483: 01c148edf213cbd8076ef92577992f4972207a14 v: v3 --- [refs] | 2 +- trunk/arch/s390/include/asm/unistd.h | 3 ++- trunk/arch/s390/kernel/compat_wrapper.S | 6 ++++++ trunk/arch/s390/kernel/syscalls.S | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c2725b8aea6e..c80737a8f97e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5069496ec40946da413646f9cd5dcb28d9b3324f +refs/heads/master: 26e8a33989183e81d6692aec1a77dffa266b91a2 diff --git a/trunk/arch/s390/include/asm/unistd.h b/trunk/arch/s390/include/asm/unistd.h index 65f11efdd94c..e00373061fc9 100644 --- a/trunk/arch/s390/include/asm/unistd.h +++ b/trunk/arch/s390/include/asm/unistd.h @@ -274,7 +274,8 @@ #define __NR_prlimit64 334 #define __NR_name_to_handle_at 335 #define __NR_open_by_handle_at 336 -#define NR_syscalls 337 +#define __NR_clock_adjtime 337 +#define NR_syscalls 338 /* * 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 03918128bb45..494db7f7c23c 100644 --- a/trunk/arch/s390/kernel/compat_wrapper.S +++ b/trunk/arch/s390/kernel/compat_wrapper.S @@ -1893,3 +1893,9 @@ compat_sys_open_by_handle_at_wrapper: llgtr %r3,%r3 # struct file_handle __user * lgfr %r4,%r4 # int jg compat_sys_open_by_handle_at + + .globl compat_sys_clock_adjtime_wrapper +compat_sys_clock_adjtime_wrapper: + lgfr %r2,%r2 # clockid_t (int) + llgtr %r3,%r3 # struct compat_timex __user * + jg compat_sys_clock_adjtime diff --git a/trunk/arch/s390/kernel/syscalls.S b/trunk/arch/s390/kernel/syscalls.S index 958744cdcaba..8ff300208d2d 100644 --- a/trunk/arch/s390/kernel/syscalls.S +++ b/trunk/arch/s390/kernel/syscalls.S @@ -345,3 +345,4 @@ SYSCALL(sys_fanotify_mark,sys_fanotify_mark,sys_fanotify_mark_wrapper) SYSCALL(sys_prlimit64,sys_prlimit64,sys_prlimit64_wrapper) SYSCALL(sys_name_to_handle_at,sys_name_to_handle_at,sys_name_to_handle_at_wrapper) /* 335 */ SYSCALL(sys_open_by_handle_at,sys_open_by_handle_at,compat_sys_open_by_handle_at_wrapper) +SYSCALL(sys_clock_adjtime,sys_clock_adjtime,compat_sys_clock_adjtime_wrapper)