From 2dc5ff96e76a38f1a5ffd4c22e350c882f7592eb Mon Sep 17 00:00:00 2001 From: peter Date: Sun, 22 Jun 1997 16:04:22 +0000 Subject: Preliminary support for per-cpu data pages. This eliminates a lot of #ifdef SMP type code. Things like _curproc reside in a data page that is unique on each cpu, eliminating the expensive macros like: #define curproc (SMPcurproc[cpunumber()]) There are some unresolved bootstrap and address space sharing issues at present, but Steve is waiting on this for other work. There is still some strictly temporary code present that isn't exactly pretty. This is part of a larger change that has run into some bumps, this part is standalone so it should be safe. The temporary code goes away when the full idle cpu support is finished. Reviewed by: fsmp, dyson --- sys/i386/isa/nmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/i386/isa/nmi.c') diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c index 81557c3..d1caa64 100644 --- a/sys/i386/isa/nmi.c +++ b/sys/i386/isa/nmi.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: intr_machdep.c,v 1.1 1997/06/02 08:19:04 dfr Exp $ + * $Id: intr_machdep.c,v 1.2 1997/06/02 15:28:10 kato Exp $ */ #include "opt_auto_eoi.h" @@ -268,7 +268,7 @@ isa_irq_pending(dvp) struct isa_device *dvp; { /* read APIC IRR containing the 16 ISA INTerrupts */ - return ((lapic__irr1 & 0x00ffffff) + return ((lapic.irr1 & 0x00ffffff) & (u_int32_t)dvp->id_irq) ? 1 : 0; } -- cgit v1.1