From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Dec 2009 21:38:21 +0000 (-0800)
Subject: Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4646575daf21f544fc2f7e8d90d8c488948fcc7c;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'x86-uv-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* '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
---

4646575daf21f544fc2f7e8d90d8c488948fcc7c
diff --cc arch/x86/include/asm/irq.h
index ffd700ff5dcb,fcbc6d144501..5458380b6ef8
--- a/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/irq.c
index fee6cc2b2079,9375dce39f5f..664bcb7384ac
--- a/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);