--- zzzz-none-000/linux-2.6.32.61/arch/mips/mm/tlb-r4k.c	2013-06-10 09:43:48.000000000 +0000
+++ ar9-7330-650/linux-2.6.32.61/arch/mips/mm/tlb-r4k.c	2013-08-28 11:10:14.000000000 +0000
@@ -29,8 +29,7 @@
 #define UNIQUE_ENTRYHI(idx) (CKSEG0 + ((idx) << (PAGE_SHIFT + 1)))
 
 /* Atomicity and interruptability */
-#ifdef CONFIG_MIPS_MT_SMTC
-
+#if defined(CONFIG_MIPS_MT_SMTC) || defined(CONFIG_MIPS_MT_SMP)
 #include <asm/smtc.h>
 #include <asm/mipsmtregs.h>
 
@@ -48,7 +47,7 @@
 #define ENTER_CRITICAL(flags) local_irq_save(flags)
 #define EXIT_CRITICAL(flags) local_irq_restore(flags)
 
-#endif /* CONFIG_MIPS_MT_SMTC */
+#endif /*--- #if defined(CONFIG_MIPS_MT_SMTC) || defined(CONFIG_MIPS_MT_SMP) ---*/
 
 #if defined(CONFIG_CPU_LOONGSON2)
 /*
@@ -212,13 +211,13 @@
 		page &= (PAGE_MASK << 1);
 		ENTER_CRITICAL(flags);
 		oldpid = read_c0_entryhi();
-		write_c0_entryhi(page | newpid);
+		write_c0_entryhi(page | newpid); /*--- per tc ---*/
 		mtc0_tlbw_hazard();
 		tlb_probe();
 		tlb_probe_hazard();
 		idx = read_c0_index();
-		write_c0_entrylo0(0);
-		write_c0_entrylo1(0);
+		write_c0_entrylo0(0); 
+		write_c0_entrylo1(0); /*--- per vpe ---*/
 		if (idx < 0)
 			goto finish;
 		/* Make sure all entries differ. */