From owner-p4-projects@FreeBSD.ORG  Tue Jan  3 22:14:20 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 52DF516A422; Tue,  3 Jan 2006 22:14:20 +0000 (GMT)
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 1018016A41F
	for <perforce@freebsd.org>; Tue,  3 Jan 2006 22:14:20 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0C52C43D72
	for <perforce@freebsd.org>; Tue,  3 Jan 2006 22:14:08 +0000 (GMT)
	(envelope-from imp@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 k03ME80q032664
	for <perforce@freebsd.org>; Tue, 3 Jan 2006 22:14:08 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k03ME8OQ032661
	for perforce@freebsd.org; Tue, 3 Jan 2006 22:14:08 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 3 Jan 2006 22:14:08 GMT
Message-Id: <200601032214.k03ME8OQ032661@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 89110 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: Tue, 03 Jan 2006 22:14:21 -0000

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

Change 89110 by imp@imp_Speedy on 2006/01/03 22:13:09

	Compile after latest changs to trapframes.

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91rm92timer.c#4 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/at91rm92timer.c#4 (text+ko) ====

@@ -36,8 +36,10 @@
 #include <sys/timetc.h>
 
 #include <machine/bus.h>
+#include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
+#include <machine/frame.h>
 #include <machine/intr.h>
 #include <arm/at91/at91rm92reg.h>
 #include <arm/at91/at91rm92var.h>
@@ -109,12 +111,14 @@
 }
 
 static void
-clock_intr(void *frame)
+clock_intr(void *arg)
 {
+	struct trapframe *fp = arg;
+
 	/* The interrupt is shared, so we have to make sure it's for us. */
 	if (bus_space_read_4(timer_softc->sc_st, timer_softc->sc_sh,
 	    TIMER_SR) & 1) {
-		hardclock(frame);
+		hardclock(TRAPF_USERMODE(fp), TRAPF_PC(fp));
 	}
 }