diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-12 08:46:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-12 08:46:34 -0800 |
| commit | 669bb4c58c3091cd54650e37c5f4e345dd12c564 (patch) | |
| tree | 4614fa05444ceadf2cb51a869423eb1b916b0f02 /arch/avr32/kernel/syscall_table.S | |
| parent | 0261b5d3a6ed43fa8f801ded6e265d1f3403ad24 (diff) | |
| parent | 8712a5b807502e0772a5127ef6de4ff4a42edc21 (diff) | |
| download | linux-669bb4c58c3091cd54650e37c5f4e345dd12c564.tar.gz linux-669bb4c58c3091cd54650e37c5f4e345dd12c564.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 updates from Hans-Christian Noren Egtvedt.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
avr32: wire up pkey syscalls
AVR32-pio: Replace two seq_printf() calls by seq_puts() in pio_bank_show()
AVR32-pio: Use seq_putc() in pio_bank_show()
AVR32-clock: Combine nine seq_printf() calls into one call in clk_show()
AVR32-clock: Use seq_putc() in two functions
Diffstat (limited to 'arch/avr32/kernel/syscall_table.S')
| -rw-r--r-- | arch/avr32/kernel/syscall_table.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S index 7b348ba70e41..774ce57f4948 100644 --- a/arch/avr32/kernel/syscall_table.S +++ b/arch/avr32/kernel/syscall_table.S @@ -341,4 +341,7 @@ sys_call_table: .long __sys_copy_file_range .long __sys_preadv2 .long __sys_pwritev2 + .long sys_pkey_mprotect + .long sys_pkey_alloc + .long sys_pkey_free /* 330 */ .long sys_ni_syscall /* r8 is saturated at nr_syscalls */ |