1 files changed, 56 insertions, 27 deletions

diff --git a/litmus/lockdown.c b/litmus/lockdown.c
index f1da7b4145d..bd24b5839bc 100644
--- a/litmus/lockdown.c
+++ b/litmus/lockdown.c
@@ -9,16 +9,70 @@
 #include <linux/math64.h>
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
+#include <linux/sched.h>
 
+#include <litmus/litmus.h>
 #include <litmus/clock.h>
 
+#ifdef CONFIG_CPU_V7
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/cacheflush.h>
+#endif
 
 #include <litmus/color.h>
 #include <litmus/debug_trace.h>
 #include <litmus/lockdown.h>
 
+
+#define MAX_NR_WAYS     16
+
+/*
+ * unlocked_way[i] : allocation can occur in way i
+ *
+ * 0 = allocation can occur in the corresponding way
+ * 1 = allocation cannot occur in the corresponding way
+ */
+u32 unlocked_way[MAX_NR_WAYS]  = {
+        0xFFFFFFFE, /* way 0 unlocked */
+        0xFFFFFFFD,
+        0xFFFFFFFB,
+        0xFFFFFFF7,
+        0xFFFFFFEF, /* way 4 unlocked */
+        0xFFFFFFDF,
+        0xFFFFFFBF,
+        0xFFFFFF7F,
+        0xFFFFFEFF, /* way 8 unlocked */
+        0xFFFFFDFF,
+        0xFFFFFBFF,
+        0xFFFFF7FF,
+        0xFFFFEFFF, /* way 12 unlocked */
+        0xFFFFDFFF,
+        0xFFFFBFFF,
+        0xFFFF7FFF,
+};
+
+#ifndef CONFIG_CPU_V7
+u32 color_read_in_mem(u32 lock_val, u32 unlock_val, void *start, void *end)
+{
+        TRACE_CUR("Dummy read_in_mem: lock_val: 0x%x  unlock_val: 0x%x  "
+                        "start: 0x%p  end: 0x%p\n", lock_val, unlock_val,
+                        start, end);
+        return 0;
+}
+
+void set_lockdown(u32 lockdown_state)
+{
+        TRACE_CUR("Dummy set_lockdown function lockdown_state: 0x%x\n",
+                        lockdown_state);
+}
+
+void litmus_setup_lockdown(void __iomem *base, u32 id)
+{
+        printk("LITMUS^RT Dummy Lockdown\n");
+}
+
+#else
+
 static void __iomem *cache_base;
 static void __iomem *lockreg_d;
 static void __iomem *lockreg_i;
@@ -38,8 +92,6 @@ struct mutex lockdown_proc;
                         void __iomem *__v = cache_base + L2X0_LOCKDOWN_WAY_I_BASE + \
                         __cpu * L2X0_LOCKDOWN_STRIDE; __v; })
 
-#define MAX_NR_WAYS     16
-
 void set_lockdown(u32 lockdown_state)
 {
         writel_relaxed(lockdown_state, lockreg_d);
@@ -91,31 +143,6 @@ void color_flush_page(void *vaddr)
         v7_flush_kern_dcache_area(vaddr, PAGE_SIZE);
 }
 
-/*
- * unlocked_way[i] : allocation can occur in way i
- *
- * 0 = allocation can occur in the corresponding way
- * 1 = allocation cannot occur in the corresponding way
- */
-u32 unlocked_way[MAX_NR_WAYS]  = {
-        0xFFFFFFFE, /* way 0 unlocked */
-        0xFFFFFFFD,
-        0xFFFFFFFB,
-        0xFFFFFFF7,
-        0xFFFFFFEF, /* way 4 unlocked */
-        0xFFFFFFDF,
-        0xFFFFFFBF,
-        0xFFFFFF7F,
-        0xFFFFFEFF, /* way 8 unlocked */
-        0xFFFFFDFF,
-        0xFFFFFBFF,
-        0xFFFFF7FF,
-        0xFFFFEFFF, /* way 12 unlocked */
-        0xFFFFDFFF,
-        0xFFFFBFFF,
-        0xFFFF7FFF,
-};
-
 static void print_lockdown_registers(void)
 {
         int i;
@@ -641,3 +668,5 @@ void litmus_setup_lockdown(void __iomem *base, u32 id)
 
         test_lockdown(NULL);
 }
+
+#endif