diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-06-20 11:57:17 -0400 |
|---|---|---|
| committer | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-06-20 11:57:17 -0400 |
| commit | a507ef3ac68f0671fdd3f824885cd7f1ea1040b1 (patch) | |
| tree | 943969bf51e7feb8fd362c551ea5446c458b6ec6 /arch/arm | |
| parent | 14eb75b6f83e3213d752dfe821df2fa57efbe519 (diff) | |
[PATCH] ARM: Remove nmi_tick() from Integrator.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -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 d302f0405fd2..bd1e5e3c9d34 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c | |||
| @@ -227,7 +227,6 @@ integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
| 227 | * primary CPU | 227 | * primary CPU |
| 228 | */ | 228 | */ |
| 229 | if (hard_smp_processor_id() == 0) { | 229 | if (hard_smp_processor_id() == 0) { |
| 230 | nmi_tick(); | ||
| 231 | timer_tick(regs); | 230 | timer_tick(regs); |
| 232 | #ifdef CONFIG_SMP | 231 | #ifdef CONFIG_SMP |
| 233 | smp_send_timer(); | 232 | smp_send_timer(); |