diff options
| author | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2011-01-01 19:00:57 +0000 |
|---|---|---|
| committer | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2011-01-01 19:00:57 +0000 |
| commit | 861557df55456939af292f50e35805d1626a90c3 (patch) | |
| tree | 761f40e364d82ba3d96d7fc67862d1eab359f04b /sys | |
| parent | 613170880de12380f5db9bac3d0baececaabad11 (diff) | |
Move setting cpu_hzticks to the clock initialization function, like
other ports (e.g. hppa64) do.
ok jsing@ kettenis@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/hppa/dev/clock.c | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/machdep.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/hppa/dev/clock.c b/sys/arch/hppa/dev/clock.c index ab3f0fa0854..3776eca6685 100644 --- a/sys/arch/hppa/dev/clock.c +++ b/sys/arch/hppa/dev/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.25 2010/08/01 09:01:45 kettenis Exp $ */ +/* $OpenBSD: clock.c,v 1.26 2011/01/01 19:00:56 jasper Exp $ */ /* * Copyright (c) 1998-2003 Michael Shalayeff @@ -63,6 +63,8 @@ cpu_initclocks(void) struct cpu_info *ci = curcpu(); u_long __itmr; + cpu_hzticks = (PAGE0->mem_10msec * 100) / hz; + itmr_timecounter.tc_frequency = PAGE0->mem_10msec * 100; tc_init(&itmr_timecounter); diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c index 18e6ac81db2..3a77fbd2833 100644 --- a/sys/arch/hppa/hppa/machdep.c +++ b/sys/arch/hppa/hppa/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.196 2011/01/01 18:59:26 jasper Exp $ */ +/* $OpenBSD: machdep.c,v 1.197 2011/01/01 19:00:56 jasper Exp $ */ /* * Copyright (c) 1999-2003 Michael Shalayeff @@ -289,7 +289,6 @@ hppa_cpuspeed(int *mhz) void hppa_init(paddr_t start) { - extern u_long cpu_hzticks; extern int kernel_text; struct cpu_info *ci; int error; @@ -297,7 +296,6 @@ hppa_init(paddr_t start) pdc_init(); /* init PDC iface, so we can call em easy */ - cpu_hzticks = (PAGE0->mem_10msec * 100) / hz; delay_init(); /* calculate cpu clock ratio */ /* cache parameters */ |