diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-07 17:06:15 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-07 17:06:15 +1000 |
commit | 38fde44da4258f0a2ae975ecc833106c726ad37e (patch) | |
tree | 69e0e7ca7581794d29eaf9bb683214a692be391b /arch/x86/syscalls | |
parent | e2ea6c3da34fa52f332cbc7914ca282cf4d2eeb9 (diff) | |
parent | af86fefe413b6b1542e1b0f97be8bc9570c5eaf7 (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/x86/syscalls')
-rw-r--r-- | arch/x86/syscalls/syscall_32.tbl | 1 | ||||
-rw-r--r-- | arch/x86/syscalls/syscall_64.tbl | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/syscalls/syscall_32.tbl b/arch/x86/syscalls/syscall_32.tbl index d1b4a119d4a5..028b78168d85 100644 --- a/arch/x86/syscalls/syscall_32.tbl +++ b/arch/x86/syscalls/syscall_32.tbl @@ -362,3 +362,4 @@ 353 i386 renameat2 sys_renameat2 354 i386 seccomp sys_seccomp 355 i386 getrandom sys_getrandom +356 i386 memfd_create sys_memfd_create diff --git a/arch/x86/syscalls/syscall_64.tbl b/arch/x86/syscalls/syscall_64.tbl index 252c804bb1aa..35dd922727b9 100644 --- a/arch/x86/syscalls/syscall_64.tbl +++ b/arch/x86/syscalls/syscall_64.tbl @@ -325,6 +325,8 @@ 316 common renameat2 sys_renameat2 317 common seccomp sys_seccomp 318 common getrandom sys_getrandom +319 common memfd_create sys_memfd_create +320 common kexec_file_load sys_kexec_file_load # # x32-specific system call numbers start at 512 to avoid cache impact |