diff options
author | 2012-01-10 20:55:11 +0400 | |
---|---|---|
committer | 2012-01-10 20:55:11 +0400 | |
commit | 913272b3864d6da89c70d9fc2c30ccb57794b369 (patch) | |
tree | 4fb0a8ab1b53623d2a8ea200b80a3ace2d271471 /arch/s390/kernel/syscalls.S | |
parent | power_supply: Mark da9052 driver as broken (diff) | |
parent | collie_battery: Get rid of irq_to_gpio usage (diff) | |
download | linux-dev-913272b3864d6da89c70d9fc2c30ccb57794b369.tar.xz linux-dev-913272b3864d6da89c70d9fc2c30ccb57794b369.zip |
Merge git://git.infradead.org/users/cbou/battery-urgent
Diffstat (limited to 'arch/s390/kernel/syscalls.S')
-rw-r--r-- | arch/s390/kernel/syscalls.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S index 73eb08c874fb..bcab2f04ba58 100644 --- a/arch/s390/kernel/syscalls.S +++ b/arch/s390/kernel/syscalls.S @@ -348,3 +348,5 @@ SYSCALL(sys_open_by_handle_at,sys_open_by_handle_at,compat_sys_open_by_handle_at SYSCALL(sys_clock_adjtime,sys_clock_adjtime,compat_sys_clock_adjtime_wrapper) SYSCALL(sys_syncfs,sys_syncfs,sys_syncfs_wrapper) SYSCALL(sys_setns,sys_setns,sys_setns_wrapper) +SYSCALL(sys_process_vm_readv,sys_process_vm_readv,compat_sys_process_vm_readv_wrapper) /* 340 */ +SYSCALL(sys_process_vm_writev,sys_process_vm_writev,compat_sys_process_vm_writev_wrapper) |