diff options
author | bde <bde@FreeBSD.org> | 1994-09-20 21:35:49 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1994-09-20 21:35:49 +0000 |
commit | 8c3a24d674ec1e9a907610ffb64a456a18dc9fad (patch) | |
tree | 0d303e550cc3b3330142f5ebb80ee66a4417a566 | |
parent | 04ba736b884db3c7e625bbf79552f805346bcea2 (diff) | |
download | FreeBSD-src-8c3a24d674ec1e9a907610ffb64a456a18dc9fad.zip FreeBSD-src-8c3a24d674ec1e9a907610ffb64a456a18dc9fad.tar.gz |
Don't supply the `usermode' arg to softclock(). The 2.0 softclock() doesn't
take an arg.
-rw-r--r-- | sys/amd64/isa/vector.S | 4 | ||||
-rw-r--r-- | sys/amd64/isa/vector.s | 4 | ||||
-rw-r--r-- | sys/i386/isa/icu.s | 20 | ||||
-rw-r--r-- | sys/i386/isa/vector.s | 4 |
4 files changed, 11 insertions, 21 deletions
diff --git a/sys/amd64/isa/vector.S b/sys/amd64/isa/vector.S index 252bd95..4e5037c 100644 --- a/sys/amd64/isa/vector.S +++ b/sys/amd64/isa/vector.S @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: vector.s,v 1.7 1994/04/02 07:00:50 davidg Exp $ + * $Id: vector.s,v 1.8 1994/08/18 05:09:36 davidg Exp $ */ #include "i386/isa/icu.h" @@ -248,7 +248,7 @@ ihandlers: /* addresses of interrupt handlers */ .long Xresume8, Xresume9, Xresume10, Xresume11 .long Xresume12, Xresume13, Xresume14, Xresume15 .long swi_tty, swi_net, 0, 0, 0, 0, 0, 0 - .long 0, 0, 0, 0, 0, 0, swi_clock, swi_ast + .long 0, 0, 0, 0, 0, 0, _softclock, swi_ast imasks: /* masks for interrupt handlers */ .space NHWI*4 /* padding; HWI masks are elsewhere */ .long SWI_TTY_MASK, SWI_NET_MASK, 0, 0, 0, 0, 0, 0 diff --git a/sys/amd64/isa/vector.s b/sys/amd64/isa/vector.s index 252bd95..4e5037c 100644 --- a/sys/amd64/isa/vector.s +++ b/sys/amd64/isa/vector.s @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: vector.s,v 1.7 1994/04/02 07:00:50 davidg Exp $ + * $Id: vector.s,v 1.8 1994/08/18 05:09:36 davidg Exp $ */ #include "i386/isa/icu.h" @@ -248,7 +248,7 @@ ihandlers: /* addresses of interrupt handlers */ .long Xresume8, Xresume9, Xresume10, Xresume11 .long Xresume12, Xresume13, Xresume14, Xresume15 .long swi_tty, swi_net, 0, 0, 0, 0, 0, 0 - .long 0, 0, 0, 0, 0, 0, swi_clock, swi_ast + .long 0, 0, 0, 0, 0, 0, _softclock, swi_ast imasks: /* masks for interrupt handlers */ .space NHWI*4 /* padding; HWI masks are elsewhere */ .long SWI_TTY_MASK, SWI_NET_MASK, 0, 0, 0, 0, 0, 0 diff --git a/sys/i386/isa/icu.s b/sys/i386/isa/icu.s index 00a8c3c..bd0d014 100644 --- a/sys/i386/isa/icu.s +++ b/sys/i386/isa/icu.s @@ -36,7 +36,7 @@ * * @(#)icu.s 7.2 (Berkeley) 5/21/91 * - * $Id: icu.s,v 1.13 1994/09/14 23:56:08 wollman Exp $ + * $Id: icu.s,v 1.14 1994/09/19 22:24:31 wollman Exp $ */ /* @@ -283,20 +283,6 @@ vec/**/irq_num: ; \ BUILD_VEC(15) ALIGN_TEXT -swi_clock: - MCOUNT - subl %eax,%eax - cmpl $_splz,(%esp) /* XXX call from splz()? */ - jae 1f /* yes, usermode = 0 */ - movl 4+4+TRAPF_CS_OFF(%esp),%eax /* no, check trap frame */ - andl $SEL_RPL_MASK,%eax -1: - pushl %eax - call _softclock - addl $4,%esp - ret - - ALIGN_TEXT .globl _dummynetisr _dummynetisr: MCOUNT @@ -335,6 +321,10 @@ swi_net: DONET(30) ; DONET(31) ret +/* + * XXX there should be a registration function to put the handler for the + * attached driver directly in ihandlers. Then this function will go away. + */ ALIGN_TEXT swi_tty: MCOUNT diff --git a/sys/i386/isa/vector.s b/sys/i386/isa/vector.s index 252bd95..4e5037c 100644 --- a/sys/i386/isa/vector.s +++ b/sys/i386/isa/vector.s @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: vector.s,v 1.7 1994/04/02 07:00:50 davidg Exp $ + * $Id: vector.s,v 1.8 1994/08/18 05:09:36 davidg Exp $ */ #include "i386/isa/icu.h" @@ -248,7 +248,7 @@ ihandlers: /* addresses of interrupt handlers */ .long Xresume8, Xresume9, Xresume10, Xresume11 .long Xresume12, Xresume13, Xresume14, Xresume15 .long swi_tty, swi_net, 0, 0, 0, 0, 0, 0 - .long 0, 0, 0, 0, 0, 0, swi_clock, swi_ast + .long 0, 0, 0, 0, 0, 0, _softclock, swi_ast imasks: /* masks for interrupt handlers */ .space NHWI*4 /* padding; HWI masks are elsewhere */ .long SWI_TTY_MASK, SWI_NET_MASK, 0, 0, 0, 0, 0, 0 |