diff options
| -rw-r--r-- | sys/arch/luna88k/luna88k/clock.c | 15 | ||||
| -rw-r--r-- | sys/arch/luna88k/luna88k/machdep.c | 13 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sys/arch/luna88k/luna88k/clock.c b/sys/arch/luna88k/luna88k/clock.c index 56f2dbfff42..c32b4b18b18 100644 --- a/sys/arch/luna88k/luna88k/clock.c +++ b/sys/arch/luna88k/luna88k/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.9 2012/11/13 19:21:19 miod Exp $ */ +/* $OpenBSD: clock.c,v 1.10 2014/09/27 19:50:10 aoyama Exp $ */ /* $NetBSD: clock.c,v 1.2 2000/01/11 10:29:35 nisimura Exp $ */ /* @@ -52,6 +52,7 @@ #include <sys/evcount.h> #include <sys/timetc.h> +#include <machine/board.h> #include <machine/cpu.h> #include <dev/clock_subr.h> @@ -215,12 +216,22 @@ resettodr() } /* + * *clock_reg[CPU] + * Points to the clock register for each CPU. + */ +volatile u_int32_t *clock_reg[] = { + (u_int32_t *)OBIO_CLOCK0, + (u_int32_t *)OBIO_CLOCK1, + (u_int32_t *)OBIO_CLOCK2, + (u_int32_t *)OBIO_CLOCK3 +}; + +/* * Clock interrupt routine */ int clockintr(void *eframe) { - extern unsigned int *clock_reg[]; #ifdef MULTIPROCESSOR struct cpu_info *ci = curcpu(); u_int cpu = ci->ci_cpuid; diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c index 15b8ce2fec5..5c7701b362f 100644 --- a/sys/arch/luna88k/luna88k/machdep.c +++ b/sys/arch/luna88k/luna88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.109 2014/09/20 09:28:24 kettenis Exp $ */ +/* $OpenBSD: machdep.c,v 1.110 2014/09/27 19:50:10 aoyama Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -167,17 +167,6 @@ volatile u_int32_t *swi_reg[] = { }; /* - * *clock_reg[CPU] - * Points to the clock register for each CPU. - */ -volatile u_int32_t *clock_reg[] = { - (u_int32_t *)OBIO_CLOCK0, - (u_int32_t *)OBIO_CLOCK1, - (u_int32_t *)OBIO_CLOCK2, - (u_int32_t *)OBIO_CLOCK3 -}; - -/* * FUSE ROM and NVRAM data */ struct fuse_rom_byte { |