Module Name: src
Committed By: simonb
Date: Wed May 5 06:46:37 UTC 2021
Modified Files:
src/sys/arch/evbmips/cavium: machdep.c
Log Message:
The watchdog setup code isn't used (yet), so don't compile in the
octeon_nmi_stack that it uses either.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbmips/cavium/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/evbmips/cavium/machdep.c
diff -u src/sys/arch/evbmips/cavium/machdep.c:1.23 src/sys/arch/evbmips/cavium/machdep.c:1.24
--- src/sys/arch/evbmips/cavium/machdep.c:1.23 Mon Aug 17 07:50:42 2020
+++ src/sys/arch/evbmips/cavium/machdep.c Wed May 5 06:46:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.23 2020/08/17 07:50:42 simonb Exp $ */
+/* $NetBSD: machdep.c,v 1.24 2021/05/05 06:46:37 simonb Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -114,7 +114,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.23 2020/08/17 07:50:42 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.24 2021/05/05 06:46:37 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -186,7 +186,9 @@ struct octeon_config octeon_configuratio
struct octeon_btdesc octeon_btdesc;
struct octeon_btinfo octeon_btinfo;
-char octeon_nmi_stack[PAGE_SIZE] __section(".data1") __aligned(PAGE_SIZE);
+#ifdef notyet
+static char octeon_nmi_stack[PAGE_SIZE] __section(".data1") __aligned(PAGE_SIZE);
+#endif
/* Currently the OCTEON kernels only support big endian boards */
CTASSERT(_BYTE_ORDER == _BIG_ENDIAN);
@@ -264,7 +266,7 @@ mach_init(uint64_t arg0, uint64_t arg1,
*/
mips_init_lwp0_uarea();
-#if 0
+#ifdef notyet
curcpu()->ci_nmi_stack = octeon_nmi_stack + sizeof(octeon_nmi_stack) - sizeof(struct kernframe);
*(uint64_t *)MIPS_PHYS_TO_KSEG0(0x800) = (intptr_t)octeon_reset_vector;
const uint64_t wdog_reg = MIPS_PHYS_TO_XKPHYS_UNCACHED(CIU_WDOG0);
@@ -274,7 +276,7 @@ mach_init(uint64_t arg0, uint64_t arg1,
wdog |= CIU_WDOGX_LEN; // max period
mips64_sd_a64(wdog_reg, wdog);
printf("Watchdog enabled!\n");
-#endif
+#endif /* notyet */
#if defined(DDB)
if (boothowto & RB_KDB)
