From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/arch/arm/include/uapi/asm/unistd.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'kernel/arch/arm/include/uapi/asm') diff --git a/kernel/arch/arm/include/uapi/asm/unistd.h b/kernel/arch/arm/include/uapi/asm/unistd.h index 0c3f5a0da..ede692ffa 100644 --- a/kernel/arch/arm/include/uapi/asm/unistd.h +++ b/kernel/arch/arm/include/uapi/asm/unistd.h @@ -414,6 +414,9 @@ #define __NR_memfd_create (__NR_SYSCALL_BASE+385) #define __NR_bpf (__NR_SYSCALL_BASE+386) #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. -- cgit 1.2.3-korg