diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-11 15:44:10 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-11 15:44:10 -0500 |
| commit | 0cbaed1d8c2493934b86b4ad99b2de9fcce008e8 (patch) | |
| tree | 31d1fe752641900a8eaa608d6daae3babd01e609 /arch/arm/kernel/calls.S | |
| parent | 505569d208e61ab14f4b87957be0970ab33eb319 (diff) | |
| parent | 1e3479225acbb7ae048ac30fb7c6090fa7f0df02 (diff) | |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"Three small fixes from over the Christmas period, and wiring up the
new execveat syscall for ARM"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8275/1: mm: fix PMD_SECT_RDONLY undeclared compile error
ARM: 8253/1: mm: use phys_addr_t type in map_lowmem() for kernel mem region
ARM: 8249/1: mm: dump: don't skip regions
ARM: wire up execveat syscall
Diffstat (limited to 'arch/arm/kernel/calls.S')
| -rw-r--r-- | arch/arm/kernel/calls.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index e51833f8cc38..05745eb838c5 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S | |||
| @@ -396,6 +396,7 @@ | |||
| 396 | CALL(sys_getrandom) | 396 | CALL(sys_getrandom) |
| 397 | /* 385 */ CALL(sys_memfd_create) | 397 | /* 385 */ CALL(sys_memfd_create) |
| 398 | CALL(sys_bpf) | 398 | CALL(sys_bpf) |
| 399 | CALL(sys_execveat) | ||
| 399 | #ifndef syscalls_counted | 400 | #ifndef syscalls_counted |
| 400 | .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls | 401 | .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls |
| 401 | #define syscalls_counted | 402 | #define syscalls_counted |