diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-28 09:06:57 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-28 09:06:57 +0300 |
| commit | 6afc0c269c3d20cde05515b00ede00e91fee0be5 (patch) | |
| tree | d54e7fa59df16bb62902129dfd28956d9ae1be19 /arch/powerpc/include/uapi/asm/unistd.h | |
| parent | 968d712a2565121b269e1037a1517916a9769423 (diff) | |
| parent | 097f70b3c4d84ffccca15195bdfde3a37c0a7c0f (diff) | |
| download | linux-6afc0c269c3d20cde05515b00ede00e91fee0be5.tar.xz | |
Merge branch 'linus' into perf/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 e4aa173dae62..6337738018aa 100644 --- a/arch/powerpc/include/uapi/asm/unistd.h +++ b/arch/powerpc/include/uapi/asm/unistd.h @@ -386,5 +386,7 @@ #define __NR_bpf 361 #define __NR_execveat 362 #define __NR_switch_endian 363 +#define __NR_userfaultfd 364 +#define __NR_membarrier 365 #endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */ |