diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2013-05-09 13:35:45 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2013-05-09 13:35:45 +0000 |
| commit | 55d2c503dd2c690a62f4aeb4fd954a588e161c7c (patch) | |
| tree | 7ef5ec1e49d009665f5dfd6feb25fdb91c51b452 /sys/arch/beagle | |
| parent | 1fdb9b5da340dae8a8d599de2c28310a020043f5 (diff) | |
Have the ARM MPCore Timer use the private timer, which will be very useful
for SMP on the newer ARMv7 boards.
From drahn at dalerahn.com.
ok bmercer@
Diffstat (limited to 'sys/arch/beagle')
| -rw-r--r-- | sys/arch/beagle/beagle/intr.c | 9 | ||||
| -rw-r--r-- | sys/arch/beagle/include/intr.h | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sys/arch/beagle/beagle/intr.c b/sys/arch/beagle/beagle/intr.c index f8f02d5dfdb..75817d02247 100644 --- a/sys/arch/beagle/beagle/intr.c +++ b/sys/arch/beagle/beagle/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.4 2011/11/06 01:34:53 drahn Exp $ */ +/* $OpenBSD: intr.c,v 1.5 2013/05/09 13:35:44 patrick Exp $ */ /* * Copyright (c) 2011 Dale Rahn <drahn@openbsd.org> * @@ -294,20 +294,23 @@ void arm_dflt_delay(u_int usecs); struct { void (*delay)(u_int); void (*initclocks)(void); - void (*setstatclockrate)(int); + void (*setstatclockrate)(int); + void (*mpstartclock)(void); } arm_clock_func = { arm_dflt_delay, NULL, + NULL, NULL }; void arm_clock_register(void (*initclock)(void), void (*delay)(u_int), - void (*statclock)(int)) + void (*statclock)(int), void(*mpstartclock)(void)) { arm_clock_func.initclocks = initclock; arm_clock_func.delay = delay; arm_clock_func.setstatclockrate = statclock; + arm_clock_func.mpstartclock = mpstartclock; } diff --git a/sys/arch/beagle/include/intr.h b/sys/arch/beagle/include/intr.h index 7f6b852312c..bffd21347ba 100644 --- a/sys/arch/beagle/include/intr.h +++ b/sys/arch/beagle/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.6 2011/11/06 01:34:53 drahn Exp $ */ +/* $OpenBSD: intr.h,v 1.7 2013/05/09 13:35:44 patrick Exp $ */ /* $NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $ */ /* @@ -138,7 +138,8 @@ void arm_intr_disestablish(void *cookie); const char *arm_intr_string(void *cookie); /* XXX - this is probably the wrong location for this */ -void arm_clock_register(void (*)(void), void (*)(u_int), void (*)(int)); +void arm_clock_register(void (*)(void), void (*)(u_int), void (*)(int), + void (*)(void)); #ifdef DIAGNOSTIC /* |