From 3c523559af9249cc2a888dfc406fdeba909055ac Mon Sep 17 00:00:00 2001 From: Jonas Bonn Date: Fri, 18 Nov 2011 14:40:04 +0100 Subject: [PATCH] --- yaml --- r: 295306 b: refs/heads/master c: 754d5c2bf65847f7ff4e0047a830154abe666112 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/openrisc/kernel/time.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index a78ebf3d02ba..491539571ded 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17425275112960af0dc9882c06c343d3b6ec8dc9 +refs/heads/master: 754d5c2bf65847f7ff4e0047a830154abe666112 diff --git a/trunk/arch/openrisc/kernel/time.c b/trunk/arch/openrisc/kernel/time.c index bd946ef1623d..7c52e9494a8d 100644 --- a/trunk/arch/openrisc/kernel/time.c +++ b/trunk/arch/openrisc/kernel/time.c @@ -125,16 +125,13 @@ irqreturn_t __irq_entry timer_interrupt(struct pt_regs *regs) static __init void openrisc_clockevent_init(void) { - clockevents_calc_mult_shift(&clockevent_openrisc_timer, - cpuinfo.clock_frequency, 4); + clockevent_openrisc_timer.cpumask = cpumask_of(0); /* We only have 28 bits */ - clockevent_openrisc_timer.max_delta_ns = - clockevent_delta2ns((u32) 0x0fffffff, &clockevent_openrisc_timer); - clockevent_openrisc_timer.min_delta_ns = - clockevent_delta2ns(1, &clockevent_openrisc_timer); - clockevent_openrisc_timer.cpumask = cpumask_of(0); - clockevents_register_device(&clockevent_openrisc_timer); + clockevents_config_and_register(&clockevent_openrisc_timer, + cpuinfo.clock_frequency, + 100, 0x0fffffff); + } /**