summaryrefslogtreecommitdiffstats
path: root/sys/pc98
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>1999-11-28 08:57:22 +0000
committernyan <nyan@FreeBSD.org>1999-11-28 08:57:22 +0000
commit38cffb40f9d1d9ec8b67ebd13661c131e06416b1 (patch)
tree3d060e91aa09e012e0f8bef89306ff725c523220 /sys/pc98
parent35f2e5452d46d5b312a48e39eac34d4299dcb1fe (diff)
downloadFreeBSD-src-38cffb40f9d1d9ec8b67ebd13661c131e06416b1.zip
FreeBSD-src-38cffb40f9d1d9ec8b67ebd13661c131e06416b1.tar.gz
Sync with sys/dev/syscons/syscons.c revision 1.327.
Diffstat (limited to 'sys/pc98')
-rw-r--r--sys/pc98/pc98/syscons.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c
index 6fa015b..2b6ba76 100644
--- a/sys/pc98/pc98/syscons.c
+++ b/sys/pc98/pc98/syscons.c
@@ -2127,14 +2127,14 @@ switch_scr(sc_softc_t *sc, u_int next_scr)
case 4:
default:
/*
- * Clear the flag and force the previous switch to finish,
- * but return now with error.
+ * Act as if the controlling program returned
+ * VT_FALSE.
*/
DPRINTF(5, ("force reset WAIT_REL, "));
sc->cur_scp->status &= ~SWITCH_WAIT_REL;
- s = do_switch_scr(sc, s);
+ sc->switch_in_progress = 0;
splx(s);
- DPRINTF(5, ("force finishing previous switch\n"));
+ DPRINTF(5, ("act as if VT_FALSE was seen\n"));
return EINVAL;
}
} else if (sc->cur_scp->status & SWITCH_WAIT_ACQ) {
OpenPOWER on IntegriCloud