diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-30 04:50:08 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-30 04:50:08 +0300 |
| commit | 1b46bac6275506db73592aa8b9bd1d67c79b95dc (patch) | |
| tree | 4294a77a5532896dfcc6730584944becdeabcee0 /arch/powerpc/include/uapi/asm/unistd.h | |
| parent | 65c4cbeba797e3fce68aba899e066f50e638e08d (diff) | |
| parent | d701cca6744fe0d67c86346dcfc9b128b17b5045 (diff) | |
| download | linux-1b46bac6275506db73592aa8b9bd1d67c79b95dc.tar.xz | |
Merge tag 'powerpc-4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
"A few more powerpc fixes for 4.6:
- cxl: Keep IRQ mappings on context teardown from Michael Neuling
- cxl: Poll for outstanding IRQs when detaching a context from
Michael Neuling
- Wire up preadv2 and pwritev2 syscalls from Rui Salvaterra"
* tag 'powerpc-4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc: wire up preadv2 and pwritev2 syscalls
cxl: Poll for outstanding IRQs when detaching a context
cxl: Keep IRQ mappings on context teardown
Diffstat (limited to 'arch/powerpc/include/uapi/asm/unistd.h')
| -rw-r--r-- | arch/powerpc/include/uapi/asm/unistd.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/uapi/asm/unistd.h b/arch/powerpc/include/uapi/asm/unistd.h index 940290d45b08..e9f5f41aa55a 100644 --- a/arch/powerpc/include/uapi/asm/unistd.h +++ b/arch/powerpc/include/uapi/asm/unistd.h @@ -390,5 +390,7 @@ #define __NR_membarrier 365 #define __NR_mlock2 378 #define __NR_copy_file_range 379 +#define __NR_preadv2 380 +#define __NR_pwritev2 381 #endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */ |