diff options
| author | imp <imp@FreeBSD.org> | 2001-09-14 05:05:08 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2001-09-14 05:05:08 +0000 |
| commit | 58130a1fd0b63f7ad4a0be6704f1d37c096589ad (patch) | |
| tree | 3d9f1628deda77c08b948cf82b8350c735cc1234 /sys/pc98/cbus | |
| parent | 18728e5844773a772ecdc05b8cc87c0823645cd2 (diff) | |
| download | FreeBSD-src-58130a1fd0b63f7ad4a0be6704f1d37c096589ad.zip FreeBSD-src-58130a1fd0b63f7ad4a0be6704f1d37c096589ad.tar.gz | |
Merge sys/isa/sio.c 1.343
KSE changes
Reviewed by: julian, bde, jhb
Diffstat (limited to 'sys/pc98/cbus')
| -rw-r--r-- | sys/pc98/cbus/sio.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index b77f94b..5887b05 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -2128,11 +2128,11 @@ determined_type: ; } static int -sioopen(dev, flag, mode, p) +sioopen(dev, flag, mode, td) dev_t dev; int flag; int mode; - struct proc *p; + struct thread *td; { struct com_s *com; int error; @@ -2190,7 +2190,7 @@ open_top: } } if (tp->t_state & TS_XCLUDE && - suser(p)) { + suser_td(td)) { error = EBUSY; goto out; } @@ -2360,11 +2360,11 @@ out: } static int -sioclose(dev, flag, mode, p) +sioclose(dev, flag, mode, td) dev_t dev; int flag; int mode; - struct proc *p; + struct thread *td; { struct com_s *com; int mynor; @@ -3124,12 +3124,12 @@ cont: } static int -sioioctl(dev, cmd, data, flag, p) +sioioctl(dev, cmd, data, flag, td) dev_t dev; u_long cmd; caddr_t data; int flag; - struct proc *p; + struct thread *td; { struct com_s *com; int error; @@ -3160,7 +3160,7 @@ sioioctl(dev, cmd, data, flag, p) } switch (cmd) { case TIOCSETA: - error = suser(p); + error = suser_td(td); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -3210,7 +3210,7 @@ sioioctl(dev, cmd, data, flag, p) if (lt->c_ospeed != 0) dt->c_ospeed = tp->t_ospeed; } - error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p); + error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td); if (error != ENOIOCTL) return (error); s = spltty(); @@ -3253,7 +3253,7 @@ sioioctl(dev, cmd, data, flag, p) break; case TIOCMSDTRWAIT: /* must be root since the wait applies to following logins */ - error = suser(p); + error = suser_td(td); if (error != 0) { splx(s); return (error); @@ -3311,7 +3311,7 @@ sioioctl(dev, cmd, data, flag, p) break; case TIOCMSDTRWAIT: /* must be root since the wait applies to following logins */ - error = suser(p); + error = suser_td(td); if (error != 0) { splx(s); return (error); |
