From owner-p4-projects@FreeBSD.ORG  Fri Jan 21 02:20:03 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BE2B616A4D1; Fri, 21 Jan 2005 02:20:02 +0000 (GMT)
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 94CB116A4CE
	for <perforce@freebsd.org>; Fri, 21 Jan 2005 02:20:02 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6361543D4C
	for <perforce@freebsd.org>; Fri, 21 Jan 2005 02:20:02 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0L2K2fB011499
	for <perforce@freebsd.org>; Fri, 21 Jan 2005 02:20:02 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0L2K2v7011496
	for perforce@freebsd.org; Fri, 21 Jan 2005 02:20:02 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 21 Jan 2005 02:20:02 GMT
Message-Id: <200501210220.j0L2K2v7011496@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 69416 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: Fri, 21 Jan 2005 02:20:03 -0000

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

Change 69416 by peter@peter_daintree on 2005/01/21 02:19:45

	-UPC98

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/mptable.c#36 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#36 (text+ko) ====

@@ -575,11 +575,9 @@
 	KASSERT(src_bus <= mptable_maxbusid, ("bus id %d too large", src_bus));
 	switch (busses[src_bus].bus_type) {
 	case ISA:
-#ifndef PC98
 		if (elcr_found)
 			return (elcr_read_trigger(src_bus_irq));
 		else
-#endif
 			return (INTR_TRIGGER_EDGE);
 	case PCI:
 		return (INTR_TRIGGER_LEVEL);