Module Name: src Committed By: simonb Date: Mon Jun 15 00:31:21 UTC 2020
Modified Files: src/sys/arch/mips/mips: mips_machdep.c Log Message: Remove mips32r2 error introduced in previous commit; there no MP support at all for 32-bit MIPSNN kernels. To generate a diff of this commit: cvs rdiff -u -r1.290 -r1.291 src/sys/arch/mips/mips/mips_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/mips/mips/mips_machdep.c diff -u src/sys/arch/mips/mips/mips_machdep.c:1.290 src/sys/arch/mips/mips/mips_machdep.c:1.291 --- src/sys/arch/mips/mips/mips_machdep.c:1.290 Sun Jun 14 14:45:12 2020 +++ src/sys/arch/mips/mips/mips_machdep.c Mon Jun 15 00:31:21 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: mips_machdep.c,v 1.290 2020/06/14 14:45:12 simonb Exp $ */ +/* $NetBSD: mips_machdep.c,v 1.291 2020/06/15 00:31:21 simonb Exp $ */ /* * Copyright 2002 Wasabi Systems, Inc. @@ -111,7 +111,7 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.290 2020/06/14 14:45:12 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.291 2020/06/15 00:31:21 simonb Exp $"); #define __INTR_PRIVATE #include "opt_cputype.h" @@ -946,7 +946,7 @@ mips32r2_vector_init(const struct splsw * If this CPU doesn't have a COP0 USERLOCAL register, at the end * of cpu_switch resume overwrite the instructions which update it. */ - if (!MIPS_HAS_USERLOCAL && cpunum == 0) { + if (!MIPS_HAS_USERLOCAL) { extern uint32_t mips32r2_cpu_switch_resume[]; for (uint32_t *insnp = mips32r2_cpu_switch_resume;; insnp++) { KASSERT(insnp[0] != JR_RA); @@ -962,8 +962,7 @@ mips32r2_vector_init(const struct splsw /* * Copy locore-function vector. */ - if (cpunum == 0) - mips_locore_jumpvec = mips32r2_locore_vec; + mips_locore_jumpvec = mips32r2_locore_vec; mips_icache_sync_all(); mips_dcache_wbinv_all();