Module Name: src Committed By: simonb Date: Sun Jul 19 08:58:35 UTC 2020
Modified Files: src/sys/arch/mips/cavium: octeon_cpunode.c Log Message: KNF whitespace nits. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/cavium/octeon_cpunode.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/cavium/octeon_cpunode.c diff -u src/sys/arch/mips/cavium/octeon_cpunode.c:1.14 src/sys/arch/mips/cavium/octeon_cpunode.c:1.15 --- src/sys/arch/mips/cavium/octeon_cpunode.c:1.14 Fri Jul 17 21:59:30 2020 +++ src/sys/arch/mips/cavium/octeon_cpunode.c Sun Jul 19 08:58:35 2020 @@ -29,7 +29,7 @@ #define __INTR_PRIVATE #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: octeon_cpunode.c,v 1.14 2020/07/17 21:59:30 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: octeon_cpunode.c,v 1.15 2020/07/19 08:58:35 simonb Exp $"); #include "locators.h" #include "cpunode.h" @@ -100,7 +100,7 @@ cpunode_mainbus_print(void *aux, const c int cpunode_mainbus_match(device_t parent, cfdata_t cf, void *aux) { - + return 1; } @@ -223,6 +223,7 @@ octeon_cpu_init(struct cpu_info *ci) static void octeon_cpu_run(struct cpu_info *ci) { + octeon_intr_init(ci); mips3_initclocks(); @@ -402,12 +403,14 @@ static void wdog_cpunode_poke(void *arg) { struct cpu_softc *cpu = arg; + mips3_sd(cpu->cpu_pp_poke, 0); } static int wdog_cpunode_tickle(struct sysmon_wdog *smw) { + wdog_cpunode_poke(curcpu()->ci_softc); #ifdef MULTIPROCESSOR // We need to send IPIs to the other CPUs to poke their wdog.