Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 3 Jan 2006 22:14:08 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 89110 for review
Message-ID:  <200601032214.k03ME8OQ032661@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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));
 	}
 }
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601032214.k03ME8OQ032661>