diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-06 09:04:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-06 09:04:35 -0400 |
commit | c98f5827f8f0e0cb075075def7f0d210992ef06d (patch) | |
tree | 28d629439a846eac733ab525a0d2d4a8e6a1649c /arch/x86/entry/syscalls/syscall_32.tbl | |
parent | 1630e843e104528ddf0208dfc692c70c9bd05a89 (diff) | |
parent | f7d665627e103e82d34306c7d3f6f46f387c0d8b (diff) | |
download | op-kernel-dev-c98f5827f8f0e0cb075075def7f0d210992ef06d.zip op-kernel-dev-c98f5827f8f0e0cb075075def7f0d210992ef06d.tar.gz |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Two fixes and a cleanup-fix, to the syscall entry code and to ptrace"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/syscalls/64: Add compat_sys_keyctl for 32-bit userspace
x86/ptrace: Stop setting TS_COMPAT in ptrace code
x86/vdso: Error out if the vDSO isn't a valid DSO
Diffstat (limited to 'arch/x86/entry/syscalls/syscall_32.tbl')
-rw-r--r-- | arch/x86/entry/syscalls/syscall_32.tbl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl index 4cddd17..f848572 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -294,7 +294,7 @@ # 285 sys_setaltroot 286 i386 add_key sys_add_key 287 i386 request_key sys_request_key -288 i386 keyctl sys_keyctl +288 i386 keyctl sys_keyctl compat_sys_keyctl 289 i386 ioprio_set sys_ioprio_set 290 i386 ioprio_get sys_ioprio_get 291 i386 inotify_init sys_inotify_init |