From cb11b3846deacafd7aedf56c247d822b6259a86f Mon Sep 17 00:00:00 2001 From: David Daney Date: Wed, 19 May 2010 10:40:53 -0700 Subject: [PATCH] --- yaml --- r: 204469 b: refs/heads/master c: 4d2b11252b92c6aca9f9222ee05e00f7262c2e53 h: refs/heads/master i: 204467: 421415225b8f0b487d4d593905ba2fc30a5c02f7 v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/cevt-r4k.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a993d6eb01ff..ac92c9a14504 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6165df980801e1be7a5b65686bd52f55e0407db1 +refs/heads/master: 4d2b11252b92c6aca9f9222ee05e00f7262c2e53 diff --git a/trunk/arch/mips/kernel/cevt-r4k.c b/trunk/arch/mips/kernel/cevt-r4k.c index 0b2450ceb13f..2a4d50ff5e2c 100644 --- a/trunk/arch/mips/kernel/cevt-r4k.c +++ b/trunk/arch/mips/kernel/cevt-r4k.c @@ -163,7 +163,6 @@ int c0_compare_int_usable(void) int __cpuinit r4k_clockevent_init(void) { - uint64_t mips_freq = mips_hpt_frequency; unsigned int cpu = smp_processor_id(); struct clock_event_device *cd; unsigned int irq; @@ -188,9 +187,9 @@ int __cpuinit r4k_clockevent_init(void) cd->name = "MIPS"; cd->features = CLOCK_EVT_FEAT_ONESHOT; + clockevent_set_clock(cd, mips_hpt_frequency); + /* Calculate the min / max delta */ - cd->mult = div_sc((unsigned long) mips_freq, NSEC_PER_SEC, 32); - cd->shift = 32; cd->max_delta_ns = clockevent_delta2ns(0x7fffffff, cd); cd->min_delta_ns = clockevent_delta2ns(0x300, cd);