Commit 6be08803 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips-fixes_5.16_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fixes from Thomas Bogendoerfer:

 - build fix for ZSTD enabled configs

 - fix for preempt warning

 - fix for loongson FTLB detection

 - fix for page table level selection

* tag 'mips-fixes_5.16_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: use 3-level pgtable for 64KB page size on MIPS_VA_BITS_48
  MIPS: loongson64: fix FTLB configuration
  MIPS: Fix using smp_processor_id() in preemptible in show_cpuinfo()
  MIPS: boot/compressed/: add __ashldi3 to target for ZSTD compression
parents c5c17547 41ce097f

arch/mips/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -3097,7 +3097,7 @@ config STACKTRACE_SUPPORT 
config PGTABLE_LEVELS

	int

	default 4 if PAGE_SIZE_4KB && MIPS_VA_BITS_48

	default 3 if 64BIT && !PAGE_SIZE_64KB

	default 3 if 64BIT && (!PAGE_SIZE_64KB || MIPS_VA_BITS_48)

	default 2



config MIPS_AUTO_PFN_OFFSET

arch/mips/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ endif 


vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o



vmlinuzobjs-$(CONFIG_KERNEL_ZSTD) += $(obj)/bswapdi.o

vmlinuzobjs-$(CONFIG_KERNEL_ZSTD) += $(obj)/bswapdi.o $(obj)/ashldi3.o



targets := $(notdir $(vmlinuzobjs-y))

arch/mips/kernel/cpu-probe.c

+2 −2
Original line number Diff line number Diff line
@@ -1734,8 +1734,6 @@ static inline void decode_cpucfg(struct cpuinfo_mips *c) 


static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu)

{

	decode_configs(c);



	/* All Loongson processors covered here define ExcCode 16 as GSExc. */

	c->options |= MIPS_CPU_GSEXCEX;
@@ -1796,6 +1794,8 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu) 
		panic("Unknown Loongson Processor ID!");

		break;

	}



	decode_configs(c);

}

#else

static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu) { }

arch/mips/kernel/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
		seq_puts(m, " tx39_cache");

	if (cpu_has_octeon_cache)

		seq_puts(m, " octeon_cache");

	if (cpu_has_fpu)

	if (raw_cpu_has_fpu)

		seq_puts(m, " fpu");

	if (cpu_has_32fpr)

		seq_puts(m, " 32fpr");