diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 08:55:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 08:55:53 -0800 |
| commit | ac111bfaa6b0b3c0edc63c27bd9617d6b08851ff (patch) | |
| tree | 69c98b53ce9f269952d3e6f1f39fdba4b3d96544 /arch/arm/mach-realview/core.c | |
| parent | 19da9b8b6ef80e4b1f870c0d270df32571fdaad6 (diff) | |
| parent | 861e37ad5969f764574722f4cfc0734511cbac7f (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-realview/core.c')
| -rw-r--r-- | arch/arm/mach-realview/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c index 4ea60d8b6e3..e2c6fa23d3c 100644 --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c @@ -550,7 +550,7 @@ static irqreturn_t realview_timer_interrupt(int irq, void *dev_id, struct pt_reg timer_tick(regs); -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) && !defined(CONFIG_LOCAL_TIMERS) smp_send_timer(); update_process_times(user_mode(regs)); #endif |