Hi, Ralf,
 
Can these two patches be merged in 3.19?

Huacai
 
------------------ Original ------------------
From:  "Huacai Chen"<redacted>;
Date:  Mon, Dec 22, 2014 10:30 AM
To:  "Ralf Baechle"<redacted>;
Cc:  "John Crispin"<john@phrozen.org>; "Steven J. Hill"<redacted>; "linux-mips"<redacted>; "Fuxin Zhang"<redacted>; "wuzhangjin"<redacted>; "Huacai Chen"<redacted>; "stable"<redacted>;
Subject:  [PATCH 1/2] MIPS: Hibernate: flush TLB entries earlier
 
We found that TLB mismatch not only happens after kernel resume, but
also happens during snapshot restore. So move it to the beginning of
swsusp_arch_suspend().

Cc: <redacted>
Signed-off-by: Huacai Chen <redacted>
---
 arch/mips/power/hibernate.S |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/mips/power/hibernate.S b/arch/mips/power/hibernate.S
index 32a7c82..e7567c8 100644
--- a/arch/mips/power/hibernate.S
+++ b/arch/mips/power/hibernate.S

@@ -30,6 +30,8 @@ LEAF(swsusp_arch_suspend)
 END(swsusp_arch_suspend)
 
 LEAF(swsusp_arch_resume)
+	/* Avoid TLB mismatch during and after kernel resume */
+	jal local_flush_tlb_all
 	PTR_L t0, restore_pblist
 0:
 	PTR_L t1, PBE_ADDRESS(t0)   /* source */

@@ -43,7 +45,6 @@ LEAF(swsusp_arch_resume)
 	bne t1, t3, 1b
 	PTR_L t0, PBE_NEXT(t0)
 	bnez t0, 0b
-	jal local_flush_tlb_all /* Avoid TLB mismatch after kernel resume */
 	PTR_LA t0, saved_regs
 	PTR_L ra, PT_R31(t0)
 	PTR_L sp, PT_R29(t0)

-- 
1.7.7.3