Fix variable name in cache-l2x0.c

Signed-off-by: Christopher Kenna <cjk@cs.unc.edu>

2 files changed, 4 insertions, 3 deletions

diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index 038d769e0db0..4f98e8e07835 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -350,7 +350,7 @@ void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask)
          */
         if (!(readl_relaxed(l2x0_base + L2X0_CTRL) & 1)) {
                 /* Make sure that I&D is not locked down when starting */
-                l2x0_unlock(cache_id);
+                l2x0_unlock(l2x0_cache_id);
 
                 /* l2x0 controller is disabled */
                 writel_relaxed(aux, l2x0_base + L2X0_AUX_CTRL);
@@ -375,8 +375,6 @@ void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask)
         color_cache_info.ways = l2x0_ways;
         color_cache_info.sets = l2x0_sets;
 
-        litmus_setup_lockdown(l2x0_base);
-
         printk(KERN_INFO "%s cache controller enabled\n", type);
         printk(KERN_INFO "l2x0: %d ways, CACHE_ID 0x%08x, AUX_CTRL 0x%08x, Cache size: %d B\n",
                         ways, cache_id, aux, l2x0_size);
diff --git a/include/litmus/color.h b/include/litmus/color.h
index 0e67028f8ea3..615ebd80703c 100644
--- a/include/litmus/color.h
+++ b/include/litmus/color.h
@@ -24,6 +24,9 @@ struct color_cache_info {
 extern struct color_cache_info color_cache_info;
 extern unsigned long color_chunk;
 
+struct vm_area_struct;
+struct ctl_table;
+
 struct page* get_colored_page(unsigned long);
 void add_page_to_color_list(struct page*);
 void add_page_to_alloced_list(struct page*, struct vm_area_struct*);