diff options
| author | peter <peter@FreeBSD.org> | 1997-04-29 20:05:48 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1997-04-29 20:05:48 +0000 |
| commit | 041bc69e49af15035295259bd4585b80b9ef5f0f (patch) | |
| tree | 6bb75d4029f36ba92ab1a486aa1414630ca05b7c /sys/i386/isa/vector.s | |
| parent | 477d4712a8d0e07080443a14b844ec172298326d (diff) | |
| download | FreeBSD-src-041bc69e49af15035295259bd4585b80b9ef5f0f.zip FreeBSD-src-041bc69e49af15035295259bd4585b80b9ef5f0f.tar.gz | |
Use a common numbering of the tty and net software interrupt levels
between the SMP and non-SMP case. It simplifies the #ifdef's, since
NHWI changes (at least for the moment) when APIC's are involved.
Diffstat (limited to 'sys/i386/isa/vector.s')
| -rw-r--r-- | sys/i386/isa/vector.s | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sys/i386/isa/vector.s b/sys/i386/isa/vector.s index c316f15..e20d9f5 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.27 1997/04/27 21:18:59 fsmp Exp $ + * $Id: vector.s,v 1.28 1997/04/28 01:47:55 fsmp Exp $ */ /* @@ -413,22 +413,19 @@ ihandlers: /* addresses of interrupt handlers */ #if defined(APIC_IO) .long Xresume16, Xresume17, Xresume18, Xresume19 .long Xresume20, Xresume21, Xresume22, Xresume23 - .long 0, 0, 0, 0, swi_tty, swi_net, _softclock, swi_ast #else - .long swi_tty, swi_net, 0, 0, 0, 0, 0, 0 - .long 0, 0, 0, 0, 0, 0, _softclock, swi_ast + .long 0, 0, 0, 0, 0, 0, 0, 0 #endif /* APIC_IO */ + .long 0, 0, 0, 0, swi_tty, swi_net, _softclock, swi_ast imasks: /* masks for interrupt handlers */ .space NHWI*4 /* padding; HWI masks are elsewhere */ -#if defined(APIC_IO) - .long 0, 0, 0, 0 /* padding */ - .long SWI_TTY_MASK, SWI_NET_MASK, SWI_CLOCK_MASK, SWI_AST_MASK -#else - .long SWI_TTY_MASK, SWI_NET_MASK, 0, 0, 0, 0, 0, 0 - .long 0, 0, 0, 0, 0, 0, SWI_CLOCK_MASK, SWI_AST_MASK +#if !defined(APIC_IO) /* Less padding for APIC_IO, NHWI is higher */ + .long 0, 0, 0, 0, 0, 0, 0, 0 #endif /* APIC_IO */ + .long 0, 0, 0, 0 + .long SWI_TTY_MASK, SWI_NET_MASK, SWI_CLOCK_MASK, SWI_AST_MASK .globl _intr_nesting_level _intr_nesting_level: |
