103 files changed, 16165 insertions, 40 deletions

diff --git a/Makefile b/Makefile
index 64562abe90a..f4b38f39651 100644
--- a/Makefile
+++ b/Makefile
@@ -708,7 +708,7 @@ export mod_strip_cmd
 
 
 ifeq ($(KBUILD_EXTMOD),)
-core-y          += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
+core-y          += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ litmus/
 
 vmlinux-dirs    := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
                      $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3c3b868948a..6dc9a2f42ab 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2214,3 +2214,11 @@ source "security/Kconfig"
 source "crypto/Kconfig"
 
 source "lib/Kconfig"
+
+config ARCH_HAS_SEND_PULL_TIMERS
+        def_bool n
+
+config ARCH_HAS_FEATHER_TRACE
+        def_bool n
+
+source "litmus/Kconfig"
diff --git a/arch/arm/include/asm/timex.h b/arch/arm/include/asm/timex.h
index 3be8de3adab..8a102a383a3 100644
--- a/arch/arm/include/asm/timex.h
+++ b/arch/arm/include/asm/timex.h
@@ -16,9 +16,11 @@
 
 typedef unsigned long cycles_t;
 
+#ifndef get_cycles
 static inline cycles_t get_cycles (void)
 {
         return 0;
 }
+#endif
 
 #endif
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index c60a2944f95..23ae09ffc49 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -403,6 +403,9 @@
 #define __NR_sendmmsg                   (__NR_SYSCALL_BASE+374)
 #define __NR_setns                      (__NR_SYSCALL_BASE+375)
 
+#define __NR_LITMUS (__NR_SYSCALL_BASE+376)
+#include <litmus/unistd_32.h>
+
 /*
  * The following SWIs are ARM private.
  */
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 9943e9e74a1..c0de805e4ea 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -385,6 +385,20 @@
                 CALL(sys_syncfs)
                 CALL(sys_sendmmsg)
 /* 375 */       CALL(sys_setns)
+                CALL(sys_set_rt_task_param)
+                CALL(sys_get_rt_task_param)
+                CALL(sys_complete_job)