diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-02 20:56:20 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-02 20:56:20 (GMT) |
| commit | 3c43de0ffd58f1d2ada3e6804fe66fdf85ccb2e5 (patch) | |
| tree | 2ba53cf4610c2472fc9edd812d0d8d77265d0c02 /arch/arm/include/uapi/asm/unistd.h | |
| parent | 7501a5332932b8758a28028ce2ed063aec912c87 (diff) | |
| parent | 9ff0bb5ba60638a688a46e93df8c5009896672eb (diff) | |
| download | linux-3c43de0ffd58f1d2ada3e6804fe66fdf85ccb2e5.tar.xz | |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
- add the new bpf syscall to ARM.
- drop a redundant return statement in __iommu_alloc_remap()
- fix a performance issue noticed by Thomas Petazzoni with
kmap_atomic().
- fix an issue with the L2 cache OF parsing code which caused it to
incorrectly print warnings on each boot, and make the warning text
more consistent with the rest of the code
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8180/1: mm: implement no-highmem fast path in kmap_atomic_pfn()
ARM: 8183/1: l2c: Improve l2c310_of_parse() error message
ARM: 8181/1: Drop extra return statement
ARM: 8182/1: l2c: Make l2x0_cache_size_of_parse() return 'int'
ARM: enable bpf syscall
Diffstat (limited to 'arch/arm/include/uapi/asm/unistd.h')
| -rw-r--r-- | arch/arm/include/uapi/asm/unistd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/uapi/asm/unistd.h b/arch/arm/include/uapi/asm/unistd.h index 3aaa75c..705bb76 100644 --- a/arch/arm/include/uapi/asm/unistd.h +++ b/arch/arm/include/uapi/asm/unistd.h @@ -412,6 +412,7 @@ #define __NR_seccomp (__NR_SYSCALL_BASE+383) #define __NR_getrandom (__NR_SYSCALL_BASE+384) #define __NR_memfd_create (__NR_SYSCALL_BASE+385) +#define __NR_bpf (__NR_SYSCALL_BASE+386) /* * The following SWIs are ARM private. |