diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 13:51:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 13:51:01 -0400 |
commit | 571503e10045c89af951962ea0bb783482663aad (patch) | |
tree | b24af1e4b5c67e2da940991b8219f8f8c4e7ac0a /arch/s390 | |
parent | 29a6ccca3869bbe33879dae0cd7df2a1559eff54 (diff) | |
parent | 7b21fddd087678a70ad64afc0f632e0f1071b092 (diff) |
Merge branch 'setns'
* setns:
ns: Wire up the setns system call
Done as a merge to make it easier to fix up conflicts in arm due to
addition of sendmmsg system call
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/include/asm/unistd.h | 3 | ||||
-rw-r--r-- | arch/s390/kernel/compat_wrapper.S | 6 | ||||
-rw-r--r-- | arch/s390/kernel/syscalls.S | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h index 9208e69245a..404bdb9671b 100644 --- a/arch/s390/include/asm/unistd.h +++ b/arch/s390/include/asm/unistd.h | |||
@@ -276,7 +276,8 @@ | |||
276 | #define __NR_open_by_handle_at 336 | 276 | #define __NR_open_by_handle_at 336 |
277 | #define __NR_clock_adjtime 337 | 277 | #define __NR_clock_adjtime 337 |
278 | #define __NR_syncfs 338 | 278 | #define __NR_syncfs 338 |
279 | #define NR_syscalls 339 | 279 | #define __NR_setns 339 |
280 | #define NR_syscalls 340 | ||
280 | 281 | ||
281 | /* | 282 | /* |
282 | * There are some system calls that are not present on 64 bit, some | 283 | * 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 1dc96ea08fa..1f5eb789c3a 100644 --- a/arch/s390/kernel/compat_wrapper.S +++ b/arch/s390/kernel/compat_wrapper.S | |||
@@ -1904,3 +1904,9 @@ compat_sys_clock_adjtime_wrapper: | |||
1904 | sys_syncfs_wrapper: | 1904 | sys_syncfs_wrapper: |
1905 | lgfr %r2,%r2 # int | 1905 | lgfr %r2,%r2 # int |
1906 | jg sys_syncfs | 1906 | jg sys_syncfs |
1907 | |||
1908 | .globl sys_setns_wrapper | ||
1909 | sys_setns_wrapper: | ||
1910 | lgfr %r2,%r2 # int | ||
1911 | lgfr %r3,%r3 # int | ||
1912 | jg sys_setns | ||
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S index 9c65fd4ddce..6ee39ef8fe4 100644 --- a/arch/s390/kernel/syscalls.S +++ b/arch/s390/kernel/syscalls.S | |||
@@ -347,3 +347,4 @@ SYSCALL(sys_name_to_handle_at,sys_name_to_handle_at,sys_name_to_handle_at_wrappe | |||
347 | SYSCALL(sys_open_by_handle_at,sys_open_by_handle_at,compat_sys_open_by_handle_at_wrapper) | 347 | SYSCALL(sys_open_by_handle_at,sys_open_by_handle_at,compat_sys_open_by_handle_at_wrapper) |
348 | SYSCALL(sys_clock_adjtime,sys_clock_adjtime,compat_sys_clock_adjtime_wrapper) | 348 | SYSCALL(sys_clock_adjtime,sys_clock_adjtime,compat_sys_clock_adjtime_wrapper) |
349 | SYSCALL(sys_syncfs,sys_syncfs,sys_syncfs_wrapper) | 349 | SYSCALL(sys_syncfs,sys_syncfs,sys_syncfs_wrapper) |
350 | SYSCALL(sys_setns,sys_setns,sys_setns_wrapper) | ||