From owner-p4-projects@FreeBSD.ORG Fri Nov 14 14:06:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56DED16A4D0; Fri, 14 Nov 2003 14:06:25 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3076016A4CE for ; Fri, 14 Nov 2003 14:06:25 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8187343FDF for ; Fri, 14 Nov 2003 14:06:24 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAEM6OXJ078049 for ; Fri, 14 Nov 2003 14:06:24 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAEM6OGb078046 for perforce@freebsd.org; Fri, 14 Nov 2003 14:06:24 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 14 Nov 2003 14:06:24 -0800 (PST) Message-Id: <200311142206.hAEM6OGb078046@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 42390 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Nov 2003 22:06:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=42390 Change 42390 by peter@peter_daintree on 2003/11/14 14:06:09 integ -I -b smp_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#13 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#25 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#7 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.2 2003/11/12 18:13:57 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.3 2003/11/14 21:00:32 jhb Exp $ */ /* @@ -171,7 +171,10 @@ atomic_add_int(&cnt.v_intr, 1); it = isrc->is_ithread; - ih = TAILQ_FIRST(&it->it_handlers); + if (it == NULL) + ih = NULL; + else + ih = TAILQ_FIRST(&it->it_handlers); /* * XXX: We assume that IRQ 0 is only used for the ISA timer ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/mptable.c,v 1.225 2003/11/11 21:19:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/mptable.c,v 1.226 2003/11/14 20:51:07 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#25 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/atpic.c,v 1.4 2003/11/14 19:13:06 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/atpic.c,v 1.5 2003/11/14 21:02:49 jhb Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" ==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#7 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/i386/isa/atpic_vector.s,v 1.39 2003/11/12 18:13:57 jhb Exp $ + * $FreeBSD: src/sys/i386/isa/atpic_vector.s,v 1.40 2003/11/14 20:06:24 peter Exp $ */ /*