---

yaml --- r: 67762 b: refs/heads/master c: 4e77ae3 h: refs/heads/master v: v3
git-mirror · Oct 12, 2007 · 88bcfa9 · 88bcfa9
1 parent fa30246
commit 88bcfa9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8ce33590687888ebb900d09557b8807c4539022
+refs/heads/master: 4e77ae3e105d28aa9410585715d83818f0abe871
diff --git a/trunk/arch/x86/kernel/nmi_64.c b/trunk/arch/x86/kernel/nmi_64.c
@@ -329,7 +329,7 @@ int __kprobes nmi_watchdog_tick(struct pt_regs * regs, unsigned reason)
 		touched = 1;
 	}
 
-	sum = read_pda(apic_timer_irqs);
+	sum = read_pda(apic_timer_irqs) + read_pda(irq0_irqs);
 	if (__get_cpu_var(nmi_touch)) {
 		__get_cpu_var(nmi_touch) = 0;
 		touched = 1;

diff --git a/trunk/arch/x86/kernel/time_64.c b/trunk/arch/x86/kernel/time_64.c
@@ -194,6 +194,8 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
 
 static irqreturn_t timer_event_interrupt(int irq, void *dev_id)
 {
+	add_pda(irq0_irqs, 1);
+
 	global_clock_event->event_handler(global_clock_event);
 
 	return IRQ_HANDLED;

diff --git a/trunk/include/asm-x86/pda.h b/trunk/include/asm-x86/pda.h
@@ -29,6 +29,7 @@ struct x8664_pda {
 	short isidle;
 	struct mm_struct *active_mm;
 	unsigned apic_timer_irqs;
+	unsigned irq0_irqs;
 } ____cacheline_aligned_in_smp;
 
 extern struct x8664_pda *_cpu_pda[];