UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

- build fix for ZSTD enabled configs 

- fix for preempt warning
 - fix for loongson FTLB detection
 - fix for page table level selection
 -----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCAA4FiEEbt46xwy6kEcDOXoUeZbBVTGwZHAFAmGh/OQaHHRzYm9nZW5k
 QGFscGhhLmZyYW5rZW4uZGUACgkQeZbBVTGwZHC8NQ/8DV03cPvb1HTLsm6TJlm2
 g8gZCF2ofoFQ6KGaTHOgQTQvtA30hy2ubpay/VgNFPfbiHNRXUF5Lf/5giIFawcu
 lxk89c0eUOZE57Y1ceBxsMROhxtTOS2yTEII6HpN1P177E2Pv0gD/tHqXSVoUAYQ
 1quGmq7xhE9X0S09PL1EI+z9Bcm3CSA1YLTipHBJBBAp+VD3c0yYI+jmYkDqd0qn
 toOWhhPZUyypr6rU1A7vb/88CaqVHMUXJqAsL40KP1Fs+vl2ASMwmbjU6VQMpt0V
 95NExNaqxHsL5SvV47nhzdnv+Limo51xVGzdn8dAee4O/+eVkGvGKnfw3BTcqzK1
 7YzzAsXmUs3iyE5GLMNUNH6MPwQGnSAQDL/bm86o2ZjPq3zDuDEbjLPIeoTX/Nxf
 x8M5XHKtrumaoY2aeIi73U2tirwpxuhg/HG+FgaOXy72ktVZFw83ARQxiLt8Jj0b
 hV5i8HqzypY5egjeUVMhPCyjCxlkhI66P6wWZVV+kHxd8X65qt9Y0kgo+OAf41sU
 2qsJBW2wk87Y+EPtLodsLot7FHA5FWL1OWm32ftZXGWysIQf+TM8oU0DvXs+3pd2
 GqMWxwvBrhkc534flH/72TUMnvStLMC8vTmL0SxEwDrhukk+8DI7xgNni/MGgLy7
 B4rV8e6KY/B3lvAo5fZ+tjc=
 =I9cB
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2021-11-27 09:50:31 -08:00
parent c5c17547b7 41ce097f71
commit 6be088036c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/Kconfig
View File

@ -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

2
arch/mips/boot/compressed/Makefile
View File

@ -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))

4
arch/mips/kernel/cpu-probe.c
View File

@ -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) { }

2
arch/mips/kernel/proc.c
View File

@ -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");