diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-23 08:28:19 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-23 08:28:19 +0100 |
| commit | 1f9ca184049724209cddbddac593d13eb87e48c0 (patch) | |
| tree | a96bfd7bad95b717d2cabfd1e00e8803e998c23d /arch/x86/entry | |
| parent | b23adb7d3f7d1d7cce03db9704de67a99ceeda38 (diff) | |
| parent | d582799fe5de1c1ca127d7f364db12a660cf46d4 (diff) | |
Merge branch 'x86/process' into x86/mm, to create new base for further patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry')
| -rw-r--r-- | arch/x86/entry/syscalls/syscall_32.tbl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl index 9ba050fe47f3..0af59fa789ea 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -390,3 +390,4 @@ 381 i386 pkey_alloc sys_pkey_alloc 382 i386 pkey_free sys_pkey_free 383 i386 statx sys_statx +384 i386 arch_prctl sys_arch_prctl compat_sys_arch_prctl |