1 files changed, 13 insertions, 11 deletions

diff --git a/include/asm-parisc/tlbflush.h b/include/asm-parisc/tlbflush.h
index ae2d12008546..3313da9ea00f 100644
--- a/include/asm-parisc/tlbflush.h
+++ b/include/asm-parisc/tlbflush.h
@@ -39,19 +39,21 @@ extern void flush_tlb_all_local(void *);
  * etc. do not do that).
  */
 
-static inline void __flush_tlb_mm(void *mmv)
-{
-        struct mm_struct *mm = (struct mm_struct *)mmv;
-        if (mm == current->active_mm)
-                load_context(mm->context);
-}
-
 static inline void flush_tlb_mm(struct mm_struct *mm)
 {
-        if (mm->context != 0)
-                free_sid(mm->context);
-        mm->context = alloc_sid();
-        on_each_cpu(__flush_tlb_mm, mm, 1, 1);
+        BUG_ON(mm == &init_mm); /* Should never happen */
+
+#ifdef CONFIG_SMP
+        flush_tlb_all();
+#else
+        if (mm) {
+                if (mm->context != 0)
+                        free_sid(mm->context);
+                mm->context = alloc_sid();
+                if (mm == current->active_mm)
+                        load_context(mm->context);
+        }
+#endif
 }
 
 extern __inline__ void flush_tlb_pgtables(struct mm_struct *mm, unsigned long start, unsigned long end)