Merge branch 'linus' into perf/core

Reason: Further changes conflict with upstream fixes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c
index 18623ba751b3..6379091a1647 100644
--- a/arch/sh/mm/pmb.c
+++ b/arch/sh/mm/pmb.c
@@ -770,7 +770,7 @@ static void __init pmb_resize(void)
                 spin_unlock_irqrestore(&pmbe->lock, flags);
         }
 
-        read_lock(&pmb_rwlock);
+        read_unlock(&pmb_rwlock);
 }
 #endif