From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed, 29 Jun 2005 17:26:19 +0000 (+0100)
Subject: [PATCH] ARM: Remove nmi_tick from integrator platforms
X-Git-Tag: v2.6.13-rc2~63^2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=20f720ccce8864583365d844d48d3fe8d0d171ad;p=~emulex%2Finfiniband.git

[PATCH] ARM: Remove nmi_tick from integrator platforms

The nmi watchdog code hasn't been merged for this platform yet.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 797c7fddaa0..dacbf504dae 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -215,7 +215,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();