diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-05 10:09:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-05 10:09:55 -0700 |
| commit | 6a74422b9710e987c7d6b85a1ade7330b1e61626 (patch) | |
| tree | ff96b100c0bf34d5abe6f31637be0d9735e17352 /arch/mips/kernel | |
| parent | Merge tag 'for-linus' of https://github.com/openrisc/linux (diff) | |
| parent | mips: math-emu: replace deprecated strcpy() in me-debugfs (diff) | |
| download | linux-6a74422b9710e987c7d6b85a1ade7330b1e61626.tar.gz linux-6a74422b9710e987c7d6b85a1ade7330b1e61626.zip | |
Merge tag 'mips_6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS updates from Thomas Bogendoerfer:
- switch longson32 platform to DT and use MIPS_GENERIC framework
- cleanups/fixes for lantiq DTs
- other cleanups and fixes
* tag 'mips_6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (30 commits)
mips: math-emu: replace deprecated strcpy() in me-debugfs
MIPS: configs: Consolidate Loongson1 defconfigs
MIPS: Unify Loongson1 PRID_REV
MIPS: loongson32: Switch to generic core
MIPS: loongson: Add built-in DTB support
MIPS: dts: loongson: Add CQ-T300B board
MIPS: dts: loongson: Add Smartloong-1C board
MIPS: dts: loongson: Add LSGZ_1B_DEV board
MIPS: dts: loongson: Add LS1B-DEMO board
dt-bindings: mips: loongson: Add LS1B-DEMO and CQ-T300B
mips: lantiq: danube: rename stp node on EASY50712 reference board
mips: lantiq: xway: sysctrl: rename stp clock
MIPS: RB532: Replace deprecated strcpy() with memcpy() and strscpy()
MIPS: Loongson64: Replace deprecated strcpy() with strscpy_pad()
MIPS: generic: Replace deprecated strcpy() in ocelot_detect()
MIPS: octeon: Replace deprecated strcpy() in octeon_model_get_string_buffer()
MIPS: octeon: Replace memset(0) + deprecated strcpy() with strscpy_pad()
MIPS: arc: Replace deprecated strcpy() with memcpy()
MIPS: txx9: Replace deprecated strcpy() with strscpy()
MIPS: sni: Replace deprecated strcpy() in sni_console_setup()
...
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/cpu-probe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 04dc9ab55524..1e49e05ac8b1 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -1288,14 +1288,14 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu) set_cpu_asid_mask(c, MIPS_ENTRYHI_ASID); c->writecombine = _CACHE_UNCACHED_ACCELERATED; break; - case PRID_IMP_LOONGSON_32: /* Loongson-1 */ + case PRID_IMP_LOONGSON_32: decode_configs(c); c->cputype = CPU_LOONGSON32; switch (c->processor_id & PRID_REV_MASK) { - case PRID_REV_LOONGSON1B: - __cpu_name[cpu] = "Loongson 1B"; + case PRID_REV_LOONGSON1: + __cpu_name[cpu] = "ICT Loongson-1"; break; } |