---

yaml --- r: 2298 b: refs/heads/master c: a507ef3 h: refs/heads/master v: v3
git-mirror · Jun 20, 2005 · 27b4ff1 · 27b4ff1
1 parent e0290a6
commit 27b4ff1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14eb75b6f83e3213d752dfe821df2fa57efbe519
+refs/heads/master: a507ef3ac68f0671fdd3f824885cd7f1ea1040b1
diff --git a/trunk/arch/arm/mach-integrator/core.c b/trunk/arch/arm/mach-integrator/core.c
@@ -227,7 +227,6 @@ integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 	 * primary CPU
 	 */
 	if (hard_smp_processor_id() == 0) {
-		nmi_tick();
 		timer_tick(regs);
 #ifdef CONFIG_SMP
 		smp_send_timer();