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/ia64/include/uapi/asm/cmpxchg.h | 2 -- kernel/arch/ia64/include/uapi/asm/unistd.h | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'kernel/arch/ia64/include/uapi') diff --git a/kernel/arch/ia64/include/uapi/asm/cmpxchg.h b/kernel/arch/ia64/include/uapi/asm/cmpxchg.h index f35109b1d..a0e3620f8 100644 --- a/kernel/arch/ia64/include/uapi/asm/cmpxchg.h +++ b/kernel/arch/ia64/include/uapi/asm/cmpxchg.h @@ -61,8 +61,6 @@ extern void ia64_xchg_called_with_bad_pointer(void); * indicated by comparing RETURN with OLD. */ -#define __HAVE_ARCH_CMPXCHG 1 - /* * This function doesn't exist, so you'll get a linker error * if something tries to do an invalid cmpxchg(). diff --git a/kernel/arch/ia64/include/uapi/asm/unistd.h b/kernel/arch/ia64/include/uapi/asm/unistd.h index 461079560..762edce75 100644 --- a/kernel/arch/ia64/include/uapi/asm/unistd.h +++ b/kernel/arch/ia64/include/uapi/asm/unistd.h @@ -332,5 +332,9 @@ #define __NR_memfd_create 1340 #define __NR_bpf 1341 #define __NR_execveat 1342 +#define __NR_userfaultfd 1343 +#define __NR_membarrier 1344 +#define __NR_kcmp 1345 +#define __NR_mlock2 1346 #endif /* _UAPI_ASM_IA64_UNISTD_H */ -- cgit 1.2.3-korg