diff options
| author | Mark Brown <broonie@kernel.org> | 2015-10-05 18:17:08 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-05 18:17:08 +0300 |
| commit | c2f4160b77f1e12b2c05f2253575617faf0c69d0 (patch) | |
| tree | a04ab897d2bc2a756d8ef780684538bb993ff4ab /arch/powerpc/include/uapi/asm/unistd.h | |
| parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) | |
| parent | 7e50711993552800644a4667daa0f569a7665eca (diff) | |
| download | linux-c2f4160b77f1e12b2c05f2253575617faf0c69d0.tar.xz | |
Merge tag 'ib-mfd-regulator-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-tps6105x
Immutable branch between MFD and Regulator due for v4.3
Diffstat (limited to 'arch/powerpc/include/uapi/asm/unistd.h')
| -rw-r--r-- | arch/powerpc/include/uapi/asm/unistd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/uapi/asm/unistd.h b/arch/powerpc/include/uapi/asm/unistd.h index e4aa173dae62..6ad58d4c879b 100644 --- a/arch/powerpc/include/uapi/asm/unistd.h +++ b/arch/powerpc/include/uapi/asm/unistd.h @@ -386,5 +386,6 @@ #define __NR_bpf 361 #define __NR_execveat 362 #define __NR_switch_endian 363 +#define __NR_userfaultfd 364 #endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */ |