diff options
| author | peter <peter@FreeBSD.org> | 2000-12-04 21:15:14 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2000-12-04 21:15:14 +0000 |
| commit | 8bd975051ebdbe73def349683309a3e8817a810c (patch) | |
| tree | 12b90cf52960947e5198729ffa8939a5bed00779 /sys/i386/isa/ithread.c | |
| parent | f2e5184027227edebf7519183f99bc3f8b96dc64 (diff) | |
| download | FreeBSD-src-8bd975051ebdbe73def349683309a3e8817a810c.zip FreeBSD-src-8bd975051ebdbe73def349683309a3e8817a810c.tar.gz | |
Cleanup some leftover lint from the old interrupt system.
Also, while here, run up to 32 interrupt sources on APIC systems.
Normalize INTREN/INTRDIS so they are the same on both UP and SMP systems
rather than sometimes a macro, and sometimes a function.
Reviewed by: jhb, jakeb
Diffstat (limited to 'sys/i386/isa/ithread.c')
| -rw-r--r-- | sys/i386/isa/ithread.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/sys/i386/isa/ithread.c b/sys/i386/isa/ithread.c index 986e41d..6a59db1 100644 --- a/sys/i386/isa/ithread.c +++ b/sys/i386/isa/ithread.c @@ -33,8 +33,6 @@ #include "opt_auto_eoi.h" -#include "isa.h" - #include <sys/param.h> #include <sys/bus.h> #include <sys/rtprio.h> /* change this name XXX */ @@ -56,33 +54,11 @@ #include <machine/md_var.h> #include <machine/segments.h> -#if defined(APIC_IO) -#include <machine/smp.h> -#include <machine/smptests.h> /** FAST_HI */ -#include <machine/resource.h> -#endif /* APIC_IO */ -#ifdef PC98 -#include <pc98/pc98/pc98.h> -#include <pc98/pc98/pc98_machdep.h> -#include <pc98/pc98/epsonio.h> -#else -#include <i386/isa/isa.h> -#endif #include <i386/isa/icu.h> -#if NISA > 0 #include <isa/isavar.h> -#endif #include <i386/isa/intr_machdep.h> #include <sys/interrupt.h> -#ifdef APIC_IO -#include <machine/clock.h> -#endif - -#include "mca.h" -#if NMCA > 0 -#include <i386/isa/mca_machdep.h> -#endif #include <sys/vmmeter.h> #include <sys/ktr.h> @@ -227,8 +203,8 @@ ithd_loop(void *dummy) INTREN (1 << me->irq); /* reset the mask bit */ me->it_proc->p_stat = SWAIT; /* we're idle */ #ifdef APIC_IO - CTR1(KTR_INTR, "ithd_loop pid %d: done", - me->it_proc->p_pid); + CTR2(KTR_INTR, "ithd_loop pid %d: done, apic_imen=%x", + me->it_proc->p_pid, apic_imen); #else CTR2(KTR_INTR, "ithd_loop pid %d: done, imen=%x", me->it_proc->p_pid, imen); |
