Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[sfrench/cifs-2.6.git] / arch / arm / mm / cache-xsc3l2.c

diff --git a/arch/arm/mm/cache-xsc3l2.c b/arch/arm/mm/cache-xsc3l2.c
index 5d180cb0bd94dab8281b3a22836a49d5b8de3a64..c3154928bccdf9750bef6da4e4fc29c2aad732f5 100644 (file)
--- a/arch/arm/mm/cache-xsc3l2.c
+++ b/arch/arm/mm/cache-xsc3l2.c
@@ -221,15 +221,14 @@ static int __init xsc3_l2_init(void)
        if (!cpu_is_xsc3() || !xsc3_l2_present())
                return 0;
 
-       if (!(get_cr() & CR_L2)) {
+       if (get_cr() & CR_L2) {
                pr_info("XScale3 L2 cache enabled.\n");
-               adjust_cr(CR_L2, CR_L2);
                xsc3_l2_inv_all();
-       }
 
-       outer_cache.inv_range = xsc3_l2_inv_range;
-       outer_cache.clean_range = xsc3_l2_clean_range;
-       outer_cache.flush_range = xsc3_l2_flush_range;
+               outer_cache.inv_range = xsc3_l2_inv_range;
+               outer_cache.clean_range = xsc3_l2_clean_range;
+               outer_cache.flush_range = xsc3_l2_flush_range;
+       }
 
        return 0;
 }