Merge branch 'linus' into cpus4096

diff --combined arch/sparc/kernel/time_64.c
index 28b48f3eb256cca2548ce547f13304f9d966384b,2db3c2229b95ca39870fef29c01677ff39dc7c2d..db310aa00183cb0b92243cc234f9fcaedc03deeb
--- 1/arch/sparc/kernel/time_64.c
--- 2/arch/sparc/kernel/time_64.c
+++ b/arch/sparc/kernel/time_64.c
@@@ -176,6 -176,7 +176,7 @@@ static struct sparc64_tick_ops tick_ope
  };
  
  struct sparc64_tick_ops *tick_ops __read_mostly = &tick_operations;
+ EXPORT_SYMBOL(tick_ops);
  
  static void stick_disable_irq(void)
  {
@@@ -639,6 -640,7 +640,7 @@@ unsigned long sparc64_get_clock_tick(un
                return ft->clock_tick_ref;
        return cpu_data(cpu).clock_tick;
  }
+ EXPORT_SYMBOL(sparc64_get_clock_tick);
  
  #ifdef CONFIG_CPU_FREQ
  
@@@ -727,7 -729,7 +729,7 @@@ void timer_interrupt(int irq, struct pt
  
        irq_enter();
  
 -      kstat_this_cpu.irqs[0]++;
 +      kstat_incr_irqs_this_cpu(0, irq_to_desc(0));
  
        if (unlikely(!evt->event_handler)) {
                printk(KERN_WARNING