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/include | |
| parent | 0261b5d3a6ed43fa8f801ded6e265d1f3403ad24 (diff) | |
| parent | 8712a5b807502e0772a5127ef6de4ff4a42edc21 (diff) | |
| download | op-kernel-dev-669bb4c58c3091cd54650e37c5f4e345dd12c564.zip op-kernel-dev-669bb4c58c3091cd54650e37c5f4e345dd12c564.tar.gz | |
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/include')
| -rw-r--r-- | arch/avr32/include/uapi/asm/unistd.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/avr32/include/uapi/asm/unistd.h b/arch/avr32/include/uapi/asm/unistd.h index 2c8a0d2..236505d 100644 --- a/arch/avr32/include/uapi/asm/unistd.h +++ b/arch/avr32/include/uapi/asm/unistd.h @@ -340,5 +340,8 @@ #define __NR_copy_file_range 325 #define __NR_preadv2 326 #define __NR_pwritev2 327 +#define __NR_pkey_mprotect 328 +#define __NR_pkey_alloc 329 +#define __NR_pkey_free 330 #endif /* _UAPI__ASM_AVR32_UNISTD_H */ |
