diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-16 09:44:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-16 09:44:40 -0800 |
| commit | a6d3bd274b85218bf7dda925d14db81e1a8268b3 (patch) | |
| tree | bb18def4472ed572b4844cb682642a4fab4c5b2a /arch/arm64/include/asm/unistd32.h | |
| parent | 2409c873be56278ea41c345b453f76813e5c3fed (diff) | |
| parent | 72d0ac048f3ded4022cf1cc72f54073f6fcad72f (diff) | |
| download | blackbird-obmc-linux-a6d3bd274b85218bf7dda925d14db81e1a8268b3.tar.gz blackbird-obmc-linux-a6d3bd274b85218bf7dda925d14db81e1a8268b3.zip | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64
Pull arm64 fixes from Catalin Marinas:
- Page protection fixes, including proper PAGE_NONE handling
- Timezone vdso sequence counting fix
- Additional compat syscall wiring
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
arm64: compat: add syscall table entries for new syscalls
arm64: mm: introduce present, faulting entries for PAGE_NONE
arm64: mm: only wrprotect clean ptes if they are present
arm64: vdso: remove broken, redundant sequence counting for timezones
Diffstat (limited to 'arch/arm64/include/asm/unistd32.h')
| -rw-r--r-- | arch/arm64/include/asm/unistd32.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h index 58432625fdb3..5ef47ba3ed45 100644 --- a/arch/arm64/include/asm/unistd32.h +++ b/arch/arm64/include/asm/unistd32.h @@ -395,8 +395,13 @@ __SYSCALL(370, sys_name_to_handle_at) __SYSCALL(371, compat_sys_open_by_handle_at) __SYSCALL(372, compat_sys_clock_adjtime) __SYSCALL(373, sys_syncfs) +__SYSCALL(374, compat_sys_sendmmsg) +__SYSCALL(375, sys_setns) +__SYSCALL(376, compat_sys_process_vm_readv) +__SYSCALL(377, compat_sys_process_vm_writev) +__SYSCALL(378, sys_ni_syscall) /* 378 for kcmp */ -#define __NR_compat_syscalls 374 +#define __NR_compat_syscalls 379 /* * Compat syscall numbers used by the AArch64 kernel. |
