---

yaml --- r: 288800 b: refs/heads/master c: d93c407 h: refs/heads/master v: v3
git-mirror · Feb 27, 2012 · c23ef3b · c23ef3b
1 parent 4607d1f
commit c23ef3b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10ea9d6f5663c3ed51f91cd037b4b9b147273cbb
+refs/heads/master: d93c4071b78f4676ef70ec8f2d4bae59b6cc5523
diff --git a/trunk/arch/x86/include/asm/hardirq.h b/trunk/arch/x86/include/asm/hardirq.h
@@ -7,7 +7,6 @@
 typedef struct {
 	unsigned int __softirq_pending;
 	unsigned int __nmi_count;	/* arch dependent */
-	unsigned int irq0_irqs;
 #ifdef CONFIG_X86_LOCAL_APIC
 	unsigned int apic_timer_irqs;	/* arch dependent */
 	unsigned int irq_spurious_count;

diff --git a/trunk/arch/x86/kernel/time.c b/trunk/arch/x86/kernel/time.c
@@ -57,9 +57,6 @@ EXPORT_SYMBOL(profile_pc);
  */
 static irqreturn_t timer_interrupt(int irq, void *dev_id)
 {
-	/* Keep nmi watchdog up to date */
-	inc_irq_stat(irq0_irqs);
-
 	global_clock_event->event_handler(global_clock_event);
 
 	/* MCA bus quirk: Acknowledge irq0 by setting bit 7 in port 0x61 */