From owner-p4-projects@FreeBSD.ORG  Fri Oct 13 18:53:30 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2635316A47B; Fri, 13 Oct 2006 18:53:30 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 DB73516A40F
	for <perforce@freebsd.org>; Fri, 13 Oct 2006 18:53:29 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6A47243D53
	for <perforce@freebsd.org>; Fri, 13 Oct 2006 18:53:29 +0000 (GMT)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9DIrTxU086910
	for <perforce@freebsd.org>; Fri, 13 Oct 2006 18:53:29 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9DIrTgg086907
	for perforce@freebsd.org; Fri, 13 Oct 2006 18:53:29 GMT
	(envelope-from piso@freebsd.org)
Date: Fri, 13 Oct 2006 18:53:29 GMT
Message-Id: <200610131853.k9DIrTgg086907@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 107837 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 13 Oct 2006 18:53:30 -0000

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

Change 107837 by piso@piso_newluxor on 2006/10/13 18:52:28

	Fixes compilation of ia64 and pc98.

Affected files ...

.. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#8 edit
.. //depot/projects/soc2006/intr_filter/pc98/cbus/clock.c#6 edit
.. //depot/projects/soc2006/intr_filter/pc98/cbus/sio.c#6 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#8 (text+ko) ====

@@ -43,6 +43,7 @@
 #include <sys/proc.h>
 #include <sys/vmmeter.h>
 #include <sys/bus.h>
+#include <sys/limits.h>
 #include <sys/malloc.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>

==== //depot/projects/soc2006/intr_filter/pc98/cbus/clock.c#6 (text+ko) ====

@@ -704,7 +704,7 @@
 	 * timecounter to user a simpler algorithm.
 	 */
 	if (!using_lapic_timer) {
-		intr_add_handler("clk", 0, clkintr, NULL, NULL,
+		intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, NULL,
 		    INTR_TYPE_CLK, NULL);
 		i8254_intsrc = intr_lookup_source(0);
 		if (i8254_intsrc != NULL)

==== //depot/projects/soc2006/intr_filter/pc98/cbus/sio.c#6 (text+ko) ====

@@ -1745,7 +1745,7 @@
 		if (ret) {
 			ret = bus_setup_intr(dev,
 					     com->irqres, INTR_TYPE_TTY,
-					     NULL, siointr, com, &com->cookie);
+					     NULL, (driver_intr_t *)siointr, com, &com->cookie);
 			if (ret == 0)
 				device_printf(dev, "unable to activate interrupt in fast mode - using normal mode\n");
 		}