initial

6 files changed, 14 insertions, 2 deletions

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 6e1fb2b2ecc7..e2284fef1ce3 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -107,6 +107,7 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
 ORIG_CFLAGS := $(KBUILD_CFLAGS)
 KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
 endif
+KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
 
 ccflags-y := -fpic -mno-single-pic-base -fno-builtin -I$(obj)
 asflags-y := -DZIMAGE
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index 7197bbe4dda1..3b7d36b921d3 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -19,7 +19,7 @@
  * This may need to be greater than __NR_last_syscall+1 in order to
  * account for the padding in the syscall table
  */
-#define __NR_syscalls  (388 + NR_litmus_syscalls + 3)
+#define __NR_syscalls  (388 + NR_litmus_syscalls + 2)
 
 
 /*
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 3e002969469a..a272b84a2fe7 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -410,6 +410,7 @@
                 CALL(sys_release_ts)
                 CALL(sys_null_call)
 /* 400 */       CALL(sys_get_current_budget)
+                CALL(sys_test_call)
 
 
 #ifndef syscalls_counted
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index e309c8f35af5..71c969a1d790 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -33,6 +33,8 @@
 #include "cache-tauros3.h"
 #include "cache-aurora-l2.h"
 
+#include <litmus/cache_proc.h>
+
 struct l2c_init_data {
         const char *type;
         unsigned way_size_0;
@@ -726,7 +728,6 @@ static void __init l2c310_fixup(void __iomem *base, u32 cache_id,
 
         if (n) {
                 unsigned i;
-
                 pr_info("L2C-310 errat%s", n > 1 ? "a" : "um");
                 for (i = 0; i < n; i++)
                         pr_cont(" %s", errata[i]);
@@ -774,6 +775,11 @@ static const struct l2c_init_data l2c310_init_fns __initconst = {
         },
 };
 
+void l2c310_flush_all(void)
+{
+        l2c210_flush_all();
+};
+
 static int __init __l2c_init(const struct l2c_init_data *data,
                              u32 aux_val, u32 aux_mask, u32 cache_id)
 {
@@ -876,6 +882,8 @@ static int __init __l2c_init(const struct l2c_init_data *data,
         pr_info("%s: CACHE_ID 0x%08x, AUX_CTRL 0x%08x\n",
                 data->type, cache_id, aux);
 
+        litmus_setup_lockdown(l2x0_base, cache_id);
+        
         return 0;
 }
 
diff --git a/arch/x86/syscalls/syscall_32.tbl b/arch/x86/syscalls/syscall_32.tbl
index a0ec8abc51f3..af5e3ccf8b31 100644
--- a/arch/x86/syscalls/syscall_32.tbl
+++ b/arch/x86/syscalls/syscall_32.tbl
@@ -378,3 +378,4 @@
 369     i386    release_ts              sys_release_ts
 370     i386    null_call               sys_null_call
 371     i386    get_current_budget      sys_get_current_budget
+372     i386    test_call               sys_test_call
\ No newline at end of file
diff --git a/arch/x86/syscalls/syscall_64.tbl b/arch/x86/syscalls/syscall_64.tbl
index 04f5b7483db3..e87042d413e9 100644
--- a/arch/x86/syscalls/syscall_64.tbl
+++ b/arch/x86/syscalls/syscall_64.tbl
@@ -343,6 +343,7 @@
 361     common  release_ts              sys_release_ts
 362     common  null_call               sys_null_call
 363     common  get_current_budget      sys_get_current_budget
+364     common  test_call               sys_test_call
 
 
 #