projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hook for ps driver and untimeout stuff for lucas drivers
[unix-history]
/
usr
/
src
/
sys
/
kern
/
subr_prf.c
diff --git
a/usr/src/sys/kern/subr_prf.c
b/usr/src/sys/kern/subr_prf.c
index
84703bb
..
c7d1cc9
100644
(file)
--- a/
usr/src/sys/kern/subr_prf.c
+++ b/
usr/src/sys/kern/subr_prf.c
@@
-1,4
+1,4
@@
-/* subr_prf.c 4.
18 81/06/11
*/
+/* subr_prf.c 4.
21 82/01/16
*/
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
@@
-170,11
+170,12
@@
printn(n, b, touser)
panic(s)
char *s;
{
panic(s)
char *s;
{
- int bootopt =
panicstr ? RB_AUTOBOOT : RB_AUTOBOOT|RB_NOSYNC
;
+ int bootopt =
RB_AUTOBOOT
;
+ if (panicstr)
+ bootopt |= RB_NOSYNC;
panicstr = s;
printf("panic: %s\n", s);
panicstr = s;
printf("panic: %s\n", s);
- (void) spl0();
boot(RB_PANIC, bootopt);
}
boot(RB_PANIC, bootopt);
}
@@
-214,11
+215,11
@@
putchar(c, touser)
if (touser) {
register struct tty *tp = u.u_ttyp;
if (touser) {
register struct tty *tp = u.u_ttyp;
- if (tp && (tp->t_state&CARR_ON)) {
+ if (tp && (tp->t_state&
TS_
CARR_ON)) {
register s = spl6();
if (c == '\n')
register s = spl6();
if (c == '\n')
- ttyoutput('\r', tp);
- ttyoutput(c, tp);
+
(void)
ttyoutput('\r', tp);
+
(void)
ttyoutput(c, tp);
ttstart(tp);
splx(s);
}
ttstart(tp);
splx(s);
}