PERFORCE change 89110 for review
Warner Losh
imp at FreeBSD.org
Tue Jan 3 14:14:21 PST 2006
http://perforce.freebsd.org/chv.cgi?CH=89110
Change 89110 by imp at 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));
}
}
More information about the p4-projects
mailing list