Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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}

Linus Torvalds 12 years ago 9df0fe64 00170fdd

+4 -2

1 changed file

expand all

arch

x86

syscalls

syscall_64.tbl

+4 -2

arch/x86/syscalls/syscall_64.tbl

··· 212 212 203 common sched_setaffinity sys_sched_setaffinity 213 213 204 common sched_getaffinity sys_sched_getaffinity 214 214 205 64 set_thread_area 215 - 206 common io_setup sys_io_setup 215 + 206 64 io_setup sys_io_setup 216 216 207 common io_destroy sys_io_destroy 217 217 208 common io_getevents sys_io_getevents 218 - 209 common io_submit sys_io_submit 218 + 209 64 io_submit sys_io_submit 219 219 210 common io_cancel sys_io_cancel 220 220 211 64 get_thread_area 221 221 212 common lookup_dcookie sys_lookup_dcookie ··· 359 359 540 x32 process_vm_writev compat_sys_process_vm_writev 360 360 541 x32 setsockopt compat_sys_setsockopt 361 361 542 x32 getsockopt compat_sys_getsockopt 362 + 543 x32 io_setup compat_sys_io_setup 363 + 544 x32 io_submit compat_sys_io_submit