From owner-p4-projects@FreeBSD.ORG  Thu Nov  6 08:40:44 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 79C7016A4D0; Thu,  6 Nov 2003 08:40:44 -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 54DA916A4CE
	for <perforce@freebsd.org>; Thu,  6 Nov 2003 08:40:44 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CEB6243FE9
	for <perforce@freebsd.org>; Thu,  6 Nov 2003 08:40:43 -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 hA6GehXJ039588
	for <perforce@freebsd.org>; Thu, 6 Nov 2003 08:40:43 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA6GehDG039585
	for perforce@freebsd.org; Thu, 6 Nov 2003 08:40:43 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Thu, 6 Nov 2003 08:40:43 -0800 (PST)
Message-Id: <200311061640.hA6GehDG039585@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 41588 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Nov 2003 16:40:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=41588

Change 41588 by peter@peter_daintree on 2003/11/06 08:39:54

	integ -b smp_hammer -I

Affected files ...

.. //depot/projects/hammer/sys/amd64/acpica/madt.c#14 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/acpica/madt.c#14 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/acpica/madt.c,v 1.3 2003/11/05 23:15:51 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/acpica/madt.c,v 1.4 2003/11/06 14:47:53 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -545,7 +545,8 @@
 		    &old_pin) != 0)
 			printf("MADT: Could not find APIC for source IRQ %d\n",
 			    intr->Source);
-		else
+		else if (ioapic_get_vector(old_ioapic, old_pin) ==
+		    intr->Source)
 			ioapic_disable_pin(old_ioapic, old_pin);
 	}
 	ioapic_set_triggermode(new_ioapic, new_pin,