diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-08-18 12:33:29 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-08-18 12:33:29 +0800 |
| commit | e779279da78339ec75fa72571ef901a447762cc6 (patch) | |
| tree | 6153fe0215590a435a1f84e5ddd6d84e15edadf1 /arch/x86/entry | |
| parent | 21a48ffe4dff2194cceeecad0436d920c267027c (diff) | |
| parent | e4884275a4bb1cbce5a24a507c3e267c887dc1bd (diff) | |
Merge tag 'v4.4.18' into linux-linaro-lsk-v4.4
This is the 4.4.18 stable release
Diffstat (limited to 'arch/x86/entry')
| -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 f17705e1332c..e62f4401e792 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 |