From owner-p4-projects@FreeBSD.ORG  Sat Nov  8 13:46:46 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ECA6916A4D0; Sat,  8 Nov 2003 13:46:45 -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 B05C216A4CE
	for <perforce@freebsd.org>; Sat,  8 Nov 2003 13:46:45 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 34C5443FAF
	for <perforce@freebsd.org>; Sat,  8 Nov 2003 13:46:45 -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 hA8LkjXJ009411
	for <perforce@freebsd.org>; Sat, 8 Nov 2003 13:46:45 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA8Lkios009408
	for perforce@freebsd.org; Sat, 8 Nov 2003 13:46:44 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Sat, 8 Nov 2003 13:46:44 -0800 (PST)
Message-Id: <200311082146.hA8Lkios009408@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 41756 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: Sat, 08 Nov 2003 21:46:46 -0000

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

Change 41756 by peter@peter_overcee on 2003/11/08 13:45:49

	integ -I -b smp_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#15 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#15 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/io_apic.c,v 1.4 2003/11/05 23:07:39 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/io_apic.c,v 1.5 2003/11/07 23:44:35 jhb Exp $");
 
 #include "opt_isa.h"
 #include "opt_no_mixed_mode.h"
@@ -406,9 +406,12 @@
 		if (bootverbose) {
 			printf("ioapic%u: intpin %d -> ",  io->io_id, i);
 			if (intpin->io_vector == VECTOR_EXTINT)
-				printf("ExtINT\n");
+				printf("ExtINT");
 			else
-				printf("irq %u\n", intpin->io_vector);
+				printf("irq %u", intpin->io_vector);
+			printf(" (%s, active%s)\n", intpin->io_edgetrigger ?
+			    "edge" : "level", intpin->io_activehi ? "hi" :
+			    "lo");
 		}
 		value = ioapic_read(apic, IOAPIC_REDTBL_LO(i));
 		ioapic_write(apic, IOAPIC_REDTBL_LO(i), value | IOART_INTMSET);