2 files changed, 4 insertions, 3 deletions

diff --git a/arch/parisc/include/asm/tlbflush.h b/arch/parisc/include/asm/tlbflush.h
index 5273da991e06..9d086a599fa0 100644
--- a/arch/parisc/include/asm/tlbflush.h
+++ b/arch/parisc/include/asm/tlbflush.h
@@ -63,13 +63,14 @@ static inline void flush_tlb_mm(struct mm_struct *mm)
 static inline void flush_tlb_page(struct vm_area_struct *vma,
         unsigned long addr)
 {
-        unsigned long flags;
+        unsigned long flags, sid;
 
         /* For one page, it's not worth testing the split_tlb variable */
 
         mb();
-        mtsp(vma->vm_mm->context,1);
+        sid = vma->vm_mm->context;
         purge_tlb_start(flags);
+        mtsp(sid, 1);
         pdtlb(addr);
         pitlb(addr);
         purge_tlb_end(flags);
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index 65fb4cbc3a0f..2e65aa54bd10 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -440,8 +440,8 @@ void __flush_tlb_range(unsigned long sid, unsigned long start,
         else {
                 unsigned long flags;
 
-                mtsp(sid, 1);
                 purge_tlb_start(flags);
+                mtsp(sid, 1);
                 if (split_tlb) {
                         while (npages--) {
                                 pdtlb(start);