diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-05 14:38:07 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-05 14:38:07 (GMT) |
| commit | 9df0fe64ebbdd85dd871cb8d52c16efe5ec45319 (patch) | |
| tree | 46892269cd241e9e914afa656836721daf4d67e1 | |
| parent | 00170fdd0846df7cdb5ad421d3a340440f930b8f (diff) | |
| parent | 7fd44dacdd803c0bbf38bf478d51d280902bb0f1 (diff) | |
| download | linux-9df0fe64ebbdd85dd871cb8d52c16efe5ec45319.tar.xz | |
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
Pull x86 x32 ABI fix from Peter Anvin:
"A single fix for the x32 ABI: the io_setup() and io_submit() system
call need to use the compat stubs"
* 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, x32: Use compat shims for io_{setup,submit}
| -rw-r--r-- | arch/x86/syscalls/syscall_64.tbl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/syscalls/syscall_64.tbl b/arch/x86/syscalls/syscall_64.tbl index 04376ac..ec255a1 100644 --- a/arch/x86/syscalls/syscall_64.tbl +++ b/arch/x86/syscalls/syscall_64.tbl @@ -212,10 +212,10 @@ 203 common sched_setaffinity sys_sched_setaffinity 204 common sched_getaffinity sys_sched_getaffinity 205 64 set_thread_area -206 common io_setup sys_io_setup +206 64 io_setup sys_io_setup 207 common io_destroy sys_io_destroy 208 common io_getevents sys_io_getevents -209 common io_submit sys_io_submit +209 64 io_submit sys_io_submit 210 common io_cancel sys_io_cancel 211 64 get_thread_area 212 common lookup_dcookie sys_lookup_dcookie @@ -359,3 +359,5 @@ 540 x32 process_vm_writev compat_sys_process_vm_writev 541 x32 setsockopt compat_sys_setsockopt 542 x32 getsockopt compat_sys_getsockopt +543 x32 io_setup compat_sys_io_setup +544 x32 io_submit compat_sys_io_submit |