Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: UV RTC: Always enable RTC clocksource
  x86: UV RTC: Rename generic_interrupt to x86_platform_ipi
  x86: UV RTC: Clean up error handling
  x86: UV RTC: Add clocksource only boot option
  x86: UV RTC: Fix early expiry handling

diff --cc arch/x86/include/asm/hardirq.h
Simple merge

diff --cc arch/x86/include/asm/hw_irq.h
Simple merge

diff --cc arch/x86/include/asm/irq.h
index ffd700f,fcbc6d1..5458380
--- 1/arch/x86/include/asm/irq.h
--- 2/arch/x86/include/asm/irq.h
+++ b/arch/x86/include/asm/irq.h
@@@ -34,10 -34,9 +34,10 @@@ static inline int irq_canonicalize(int 
  #ifdef CONFIG_HOTPLUG_CPU
  #include <linux/cpumask.h>
  extern void fixup_irqs(void);
 +extern void irq_force_complete_move(int);
  #endif
  
- extern void (*generic_interrupt_extension)(void);
+ extern void (*x86_platform_ipi_callback)(void);
  extern void native_init_IRQ(void);
  extern bool handle_irq(unsigned irq, struct pt_regs *regs);
  

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc arch/x86/kernel/irq.c
index fee6cc2,9375dce..664bcb7
--- 1/arch/x86/kernel/irq.c
--- 2/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@@ -263,11 -264,12 +263,11 @@@ void smp_x86_platform_ipi(struct pt_reg
  
        irq_enter();
  
-       inc_irq_stat(generic_irqs);
+       inc_irq_stat(x86_platform_ipis);
  
-       if (generic_interrupt_extension)
-               generic_interrupt_extension();
+       if (x86_platform_ipi_callback)
+               x86_platform_ipi_callback();
  
 -      run_local_timers();
        irq_exit();
  
        set_irq_regs(old_regs);