From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 23 Dec 2008 15:30:31 +0000 (+0100)
Subject: Merge branch 'x86/irq' into x86/core
X-Git-Tag: v2.6.29-rc1~587^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bed4f13065b520e564adffbfcd1c1a764a9c887e;p=linux-2.6-omap-h63xx.git

Merge branch 'x86/irq' into x86/core
---

bed4f13065b520e564adffbfcd1c1a764a9c887e
diff --cc arch/x86/kernel/time_64.c
index 1b7711b3103,1749cacde8b..891e7a7c433
--- a/arch/x86/kernel/time_64.c
+++ b/arch/x86/kernel/time_64.c
@@@ -49,9 -49,9 +49,9 @@@ unsigned long profile_pc(struct pt_reg
  }
  EXPORT_SYMBOL(profile_pc);
  
 -irqreturn_t timer_interrupt(int irq, void *dev_id)
 +static irqreturn_t timer_interrupt(int irq, void *dev_id)
  {
- 	add_pda(irq0_irqs, 1);
+ 	inc_irq_stat(irq0_irqs);
  
  	global_clock_event->event_handler(global_clock_event);