diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2014-03-31 12:17:33 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-03-31 12:17:33 -0400 |
| commit | ade63aada79c61bcd5f51cbd310f237399892268 (patch) | |
| tree | 4f8605528bfd9b6261679883974b9ac4870223dd /arch/mips/power/hibernate.S | |
| parent | 9a1724c7506bfa7d3d9dcab13f83e9e6446929f9 (diff) | |
| parent | c14af233fbe279d0e561ecf84f1208b1bae087ef (diff) | |
Merge branch '3.14-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/power/hibernate.S')
| -rw-r--r-- | arch/mips/power/hibernate.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/power/hibernate.S b/arch/mips/power/hibernate.S index 7e0277a1048f..32a7c828f073 100644 --- a/arch/mips/power/hibernate.S +++ b/arch/mips/power/hibernate.S | |||
| @@ -43,6 +43,7 @@ LEAF(swsusp_arch_resume) | |||
| 43 | bne t1, t3, 1b | 43 | bne t1, t3, 1b |
| 44 | PTR_L t0, PBE_NEXT(t0) | 44 | PTR_L t0, PBE_NEXT(t0) |
| 45 | bnez t0, 0b | 45 | bnez t0, 0b |
| 46 | jal local_flush_tlb_all /* Avoid TLB mismatch after kernel resume */ | ||
| 46 | PTR_LA t0, saved_regs | 47 | PTR_LA t0, saved_regs |
| 47 | PTR_L ra, PT_R31(t0) | 48 | PTR_L ra, PT_R31(t0) |
| 48 | PTR_L sp, PT_R29(t0) | 49 | PTR_L sp, PT_R29(t0) |