Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into...
Thomas Gleixner [Sat, 14 May 2011 10:06:36 +0000 (12:06 +0200)]
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 <tglx@linutronix.de>

1  2 
arch/alpha/kernel/time.c
arch/blackfin/kernel/time-ts.c
arch/ia64/kernel/time.c
arch/microblaze/kernel/timer.c
arch/mips/sgi-ip27/ip27-timer.c
arch/x86/kernel/apb_timer.c
arch/x86/kernel/i8253.c
arch/x86/lguest/boot.c
arch/x86/xen/time.c
include/linux/clocksource.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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 */
@@@ -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. */
Simple merge
Simple merge