From ab3a7bbba4cae126a77b598ef0d89285aeb69f35 Mon Sep 17 00:00:00 2001 From: deraadt Date: Tue, 14 Nov 1995 13:24:58 +0000 Subject: [PATCH] clear pv_synchook if we halt; thus prom "sync" command will not do the wrong thing --- sys/arch/sparc/sparc/machdep.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c index 9a479540101..beb7244f608 100644 --- a/sys/arch/sparc/sparc/machdep.c +++ b/sys/arch/sparc/sparc/machdep.c @@ -75,6 +75,7 @@ #include #include +#include #include #include #include @@ -606,6 +607,7 @@ boot(howto) static char str[4]; /* room for "-sd\0" */ extern volatile void romhalt(void); extern volatile void romboot(char *); + extern struct promvec *promvec; fb_unblank(); boothowto = howto; @@ -627,8 +629,13 @@ boot(howto) resettodr(); } (void) splhigh(); /* ??? */ + if (howto & RB_HALT) { printf("halted\n\n"); +#if defined(SUN4M) || defined(SUN4C) + if (cputyp==CPU_SUN4M || cputyp==CPU_SUN4C) + *promvec->pv_synchook = NULL; +#endif romhalt(); } if (howto & RB_DUMP) @@ -644,6 +651,10 @@ boot(howto) str[i] = 0; } else str[0] = 0; +#if defined(SUN4M) || defined(SUN4C) + if (cputyp==CPU_SUN4M || cputyp==CPU_SUN4C) + *promvec->pv_synchook = NULL; +#endif romboot(str); /*NOTREACHED*/ } -- 2.20.1