Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] SMP: Fix use of cpumasks.
  [MIPS] Revert "[MIPS] tlbex.c: Cleanup __init usage."
  [MIPS] CFE: Add missing parenthesis.

arch/mips/kernel/smp.c

@@ -379,7 +379,7 @@ void flush_tlb_mm(struct mm_struct *mm)
 		unsigned int cpu;
 
 		cpu_clear(smp_processor_id(), mask);
-		for_each_online_cpu(cpu)
+		for_each_cpu_mask(cpu, mask)
 			if (cpu_context(cpu, mm))
 				cpu_context(cpu, mm) = 0;
 	}
@@ -419,7 +419,7 @@ void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned l
 		unsigned int cpu;
 
 		cpu_clear(smp_processor_id(), mask);
-		for_each_online_cpu(cpu)
+		for_each_cpu_mask(cpu, mask)
 			if (cpu_context(cpu, mm))
 				cpu_context(cpu, mm) = 0;
 	}
@@ -466,7 +466,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
 		unsigned int cpu;
 
 		cpu_clear(smp_processor_id(), mask);
-		for_each_online_cpu(cpu)
+		for_each_cpu_mask(cpu, mask)
 			if (cpu_context(cpu, vma->vm_mm))
 				cpu_context(cpu, vma->vm_mm) = 0;
 	}

include/asm-mips/fw/cfe/cfe_api.h

@@ -154,7 +154,7 @@ int64_t cfe_getticks(void);
 #define cfe_readblk(a, b, c, d)		__cfe_readblk(a, b, c, d)
 #define cfe_setenv(a, b)		__cfe_setenv(a, b)
 #define cfe_write(a, b, c)		__cfe_write(a, b, c)
-#define cfe_writeblk(a, b, c, d		__cfe_writeblk(a, b, c, d)
+#define cfe_writeblk(a, b, c, d)	__cfe_writeblk(a, b, c, d)
 #endif				/* CFE_API_IMPL_NAMESPACE */
 
 int cfe_close(int handle);