diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-06-12 04:26:49 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-06-12 04:27:40 -0400 |
commit | 310d6b671588dd7695cbc0d09d02e41d94a42bed (patch) | |
tree | 910fff05abbdc2125f151d84594609379ba612cc /arch/s390 | |
parent | fc39453debac927a3ba477bafbc6c18c7166ae78 (diff) |
[S390] wire up sys_perf_counter_open
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/include/asm/unistd.h | 3 | ||||
-rw-r--r-- | arch/s390/kernel/compat_wrapper.S | 9 | ||||
-rw-r--r-- | arch/s390/kernel/syscalls.S | 1 |
3 files changed, 12 insertions, 1 deletions
diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h index 90557237172b..c80602d7c880 100644 --- a/arch/s390/include/asm/unistd.h +++ b/arch/s390/include/asm/unistd.h | |||
@@ -268,7 +268,8 @@ | |||
268 | #define __NR_preadv 328 | 268 | #define __NR_preadv 328 |
269 | #define __NR_pwritev 329 | 269 | #define __NR_pwritev 329 |
270 | #define __NR_rt_tgsigqueueinfo 330 | 270 | #define __NR_rt_tgsigqueueinfo 330 |
271 | #define NR_syscalls 331 | 271 | #define __NR_perf_counter_open 331 |
272 | #define NR_syscalls 332 | ||
272 | 273 | ||
273 | /* | 274 | /* |
274 | * There are some system calls that are not present on 64 bit, some | 275 | * There are some system calls that are not present on 64 bit, some |
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S index d2e7fbf5d65d..88a83366819f 100644 --- a/arch/s390/kernel/compat_wrapper.S +++ b/arch/s390/kernel/compat_wrapper.S | |||
@@ -1831,3 +1831,12 @@ compat_sys_rt_tgsigqueueinfo_wrapper: | |||
1831 | lgfr %r4,%r4 # int | 1831 | lgfr %r4,%r4 # int |
1832 | llgtr %r5,%r5 # struct compat_siginfo * | 1832 | llgtr %r5,%r5 # struct compat_siginfo * |
1833 | jg compat_sys_rt_tgsigqueueinfo_wrapper # branch to system call | 1833 | jg compat_sys_rt_tgsigqueueinfo_wrapper # branch to system call |
1834 | |||
1835 | .globl sys_perf_counter_open_wrapper | ||
1836 | sys_perf_counter_open_wrapper: | ||
1837 | llgtr %r2,%r2 # const struct perf_counter_attr * | ||
1838 | lgfr %r3,%r3 # pid_t | ||
1839 | lgfr %r4,%r4 # int | ||
1840 | lgfr %r5,%r5 # int | ||
1841 | llgfr %r6,%r6 # unsigned long | ||
1842 | jg sys_perf_counter_open # branch to system call | ||
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S index 82f89ef87d2e..ad1acd200385 100644 --- a/arch/s390/kernel/syscalls.S +++ b/arch/s390/kernel/syscalls.S | |||
@@ -339,3 +339,4 @@ SYSCALL(sys_epoll_create1,sys_epoll_create1,sys_epoll_create1_wrapper) | |||
339 | SYSCALL(sys_preadv,sys_preadv,compat_sys_preadv_wrapper) | 339 | SYSCALL(sys_preadv,sys_preadv,compat_sys_preadv_wrapper) |
340 | SYSCALL(sys_pwritev,sys_pwritev,compat_sys_pwritev_wrapper) | 340 | SYSCALL(sys_pwritev,sys_pwritev,compat_sys_pwritev_wrapper) |
341 | SYSCALL(sys_rt_tgsigqueueinfo,sys_rt_tgsigqueueinfo,compat_sys_rt_tgsigqueueinfo_wrapper) /* 330 */ | 341 | SYSCALL(sys_rt_tgsigqueueinfo,sys_rt_tgsigqueueinfo,compat_sys_rt_tgsigqueueinfo_wrapper) /* 330 */ |
342 | SYSCALL(sys_perf_counter_open,sys_perf_counter_open,sys_perf_counter_open_wrapper) | ||