build failure in v3.12-stable-queue

[Guenter Roeck <linux@xxxxxxxxxxxx>]

Hi Jiri,

I see the following build failure in v3.12-stable-queue.

Building mips:cavium_octeon_defconfig ... failed
--------------
Error log:
arch/mips/mm/tlbex.c: In function 'build_huge_handler_tail':
arch/mips/mm/tlbex.c:782:6: error: 'cpu_has_ftlb' undeclared (first use in this function)
  if (cpu_has_ftlb && flush) {
      ^
arch/mips/mm/tlbex.c:782:6: note: each undeclared identifier is reported only once for each function it appears in
In file included from include/linux/bug.h:4:0,
                 from arch/mips/mm/tlbex.c:24:
arch/mips/mm/tlbex.c:783:11: error: 'cpu_has_tlbinv' undeclared (first use in this function)
   BUG_ON(!cpu_has_tlbinv);
           ^
arch/mips/include/asm/bug.h:33:44: note: in definition of macro 'BUG_ON'
 #define BUG_ON(C) __BUG_ON((unsigned long)(C))
                                            ^
arch/mips/mm/tlbex.c:786:27: error: 'MIPS_ENTRYHI_EHINV' undeclared (first use in this function)
   uasm_i_ori(p, ptr, ptr, MIPS_ENTRYHI_EHINV);

Let me know if I need to bisect.

Thanks,
Guenter