diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-06-29 13:26:19 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-06-29 13:26:19 -0400 |
| commit | 20f720ccce8864583365d844d48d3fe8d0d171ad (patch) | |
| tree | 093f9b4d2a1c366dc086a4d68f7ae3653c58775f /arch/arm/mach-integrator | |
| parent | c7e788766610bdc764d7150e69ace2e0c4196cf0 (diff) | |
[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>
Diffstat (limited to 'arch/arm/mach-integrator')
| -rw-r--r-- | arch/arm/mach-integrator/core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index 797c7fddaa0d..dacbf504dae2 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) | |||
| 215 | * primary CPU | 215 | * primary CPU |
| 216 | */ | 216 | */ |
| 217 | if (hard_smp_processor_id() == 0) { | 217 | if (hard_smp_processor_id() == 0) { |
| 218 | nmi_tick(); | ||
| 219 | timer_tick(regs); | 218 | timer_tick(regs); |
| 220 | #ifdef CONFIG_SMP | 219 | #ifdef CONFIG_SMP |
| 221 | smp_send_timer(); | 220 | smp_send_timer(); |