These patches fix FTLB detection on R6 cores. Currently an FTLB will be assumed to exist, so if not then the setting of the FTLB page size will likely fail during boot. The first patch adds cpu_has_ftlb, based on Config.MT (MMU type), which distinguishes a traditional TLB from a VTLB+FTLB configuration. The second patch fixes the probe logic to use cpu_has_ftlb for R6. James Hogan (2): MIPS: cpu-features: Add cpu_has_ftlb MIPS: Fix FTLB detection for R6 arch/mips/include/asm/cpu-features.h | 3 +++ arch/mips/include/asm/cpu.h | 1 + arch/mips/include/asm/mipsregs.h | 2 ++ arch/mips/kernel/cpu-probe.c | 23 ++++++++++++++--------- 4 files changed, 20 insertions(+), 9 deletions(-) Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: Markos Chandras <markos.chandras@xxxxxxxxxx> Cc: linux-mips@xxxxxxxxxxxxxx -- 2.4.6