diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-30 01:13:07 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-30 01:13:07 (GMT) |
| commit | 04527fdafe2e12ad2d89bfd0f0bb7fe481687976 (patch) | |
| tree | 680d47037ef787522b6d8476dfe62c40e36ddf90 /arch/arm/include | |
| parent | 36511e86079c57077493a07be60b39376d7cea74 (diff) | |
| parent | aa7d5f18e54529ae58a494447ee9b610d379b8d2 (diff) | |
| download | linux-04527fdafe2e12ad2d89bfd0f0bb7fe481687976.tar.xz | |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"Just two changes this time around:
- wire up the new mlock2 syscall added during the last merge window
- fix a build problem with certain configurations provoked by making
CONFIG_OF user selectable"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8454/1: OF implies OF_FLATTREE
ARM: wire up mlock2 syscall
Diffstat (limited to 'arch/arm/include')
| -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 7a2a32a1..ede692f 100644 --- a/arch/arm/include/uapi/asm/unistd.h +++ b/arch/arm/include/uapi/asm/unistd.h @@ -416,6 +416,7 @@ #define __NR_execveat (__NR_SYSCALL_BASE+387) #define __NR_userfaultfd (__NR_SYSCALL_BASE+388) #define __NR_membarrier (__NR_SYSCALL_BASE+389) +#define __NR_mlock2 (__NR_SYSCALL_BASE+390) /* * The following SWIs are ARM private. |