Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15

This merge of the irq-core-for-linus branch broke the ARM build when
Xen is enabled.

Conflicts:
	drivers/xen/events/events_base.c

1 files changed, 3 insertions, 0 deletions

diff --git a/mm/mmu_context.c b/mm/mmu_context.c
index 8a8cd0265e52..f802c2d216a7 100644
--- a/mm/mmu_context.c
+++ b/mm/mmu_context.c
@@ -31,6 +31,9 @@ void use_mm(struct mm_struct *mm)
         tsk->mm = mm;
         switch_mm(active_mm, mm, tsk);
         task_unlock(tsk);
+#ifdef finish_arch_post_lock_switch
+        finish_arch_post_lock_switch();
+#endif
 
         if (active_mm != mm)
                 mmdrop(active_mm);