Merge branch 'linus' into perf/core

Merge reason: Pick up the latest perf fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 3 insertions, 2 deletions

diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index 9819869d2bc9..df4955885b21 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -218,6 +218,9 @@ void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask)
         cache_id = readl(l2x0_base + L2X0_CACHE_ID);
         aux = readl(l2x0_base + L2X0_AUX_CTRL);
 
+        aux &= aux_mask;
+        aux |= aux_val;
+
         /* Determine the number of ways */
         switch (cache_id & L2X0_CACHE_ID_PART_MASK) {
         case L2X0_CACHE_ID_PART_L310:
@@ -248,8 +251,6 @@ void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask)
         if (!(readl(l2x0_base + L2X0_CTRL) & 1)) {
 
                 /* l2x0 controller is disabled */
-                aux &= aux_mask;
-                aux |= aux_val;
                 writel(aux, l2x0_base + L2X0_AUX_CTRL);
 
                 l2x0_inv_all();