From: Thomas Gleixner Date: Sat, 14 May 2011 10:06:36 +0000 (+0200) Subject: Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a18f22a968de17b29f2310cdb7ba69163e65ec15;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'consolidate-clksrc-i8253' of ~rmk/linux-2.6-arm into timers/clocksource Conflicts: arch/ia64/kernel/cyclone.c arch/mips/kernel/i8253.c arch/x86/kernel/i8253.c Reason: Resolve conflicts so further cleanups do not conflict further Signed-off-by: Thomas Gleixner --- a18f22a968de17b29f2310cdb7ba69163e65ec15 diff --cc arch/x86/kernel/i8253.c index 212fe6590aab,b904dfbf6dbc..577e90cadaeb --- a/arch/x86/kernel/i8253.c +++ b/arch/x86/kernel/i8253.c @@@ -203,8 -130,8 +130,7 @@@ static int __init init_pit_clocksource( pit_ce.mode != CLOCK_EVT_MODE_PERIODIC) return 0; - return clocksource_register_hz(&pit_cs, CLOCK_TICK_RATE); + return clocksource_i8253_init(); } arch_initcall(init_pit_clocksource); -- #endif /* !CONFIG_X86_64 */ diff --cc arch/x86/lguest/boot.c index 5b96fd95bdab,1cd608973ce5..4e0068ead6b4 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c @@@ -993,9 -995,9 +993,9 @@@ static void lguest_time_irq(unsigned in static void lguest_time_init(void) { /* Set up the timer interrupt (0) to go to our simple timer routine */ - set_irq_handler(0, lguest_time_irq); + irq_set_handler(0, lguest_time_irq); - clocksource_register(&lguest_clock); + clocksource_register_hz(&lguest_clock, NSEC_PER_SEC); /* We can't set cpumask in the initializer: damn C limitations! Set it * here and register our timer device. */