diff options
author | Ingo Molnar | 2015-10-20 10:16:46 +0200 |
---|---|---|
committer | Ingo Molnar | 2015-10-20 10:16:46 +0200 |
commit | a1a2ab2ff7040bdc9a31bfe7173913971f7d723b (patch) | |
tree | a5b448aaedafafca6974710b7d64074ed964fe24 /arch/arm64/include/asm/unistd.h | |
parent | locking/rwsem: Use acquire/release semantics (diff) | |
parent | Linux 4.3-rc6 (diff) | |
download | kernel-qcow2-linux-a1a2ab2ff7040bdc9a31bfe7173913971f7d723b.tar.gz kernel-qcow2-linux-a1a2ab2ff7040bdc9a31bfe7173913971f7d723b.tar.xz kernel-qcow2-linux-a1a2ab2ff7040bdc9a31bfe7173913971f7d723b.zip |
Merge tag 'v4.3-rc6' into locking/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/unistd.h')
-rw-r--r-- | arch/arm64/include/asm/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index 3bc498c250dc..41e58fe3c041 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -44,7 +44,7 @@ #define __ARM_NR_compat_cacheflush (__ARM_NR_COMPAT_BASE+2) #define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE+5) -#define __NR_compat_syscalls 388 +#define __NR_compat_syscalls 390 #endif #define __ARCH_WANT_SYS_CLONE |