diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 15:00:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 15:00:10 -0700 |
commit | 8b789b7d7e9b12b086d6d2f0759073a11447c7e7 (patch) | |
tree | d14d2475f9f71e27bc60f20d6400a3a05b64f62b /arch/arm/kernel/process.c | |
parent | 61cca8c72eb284e80876bafdea057055f6e793e4 (diff) | |
parent | b46ffaefe3c251897de23e5a534dd922c969d67b (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/kernel/process.c')
-rw-r--r-- | arch/arm/kernel/process.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 8f146a4b475..bbea636ff68 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -32,6 +32,7 @@ #include <asm/leds.h> #include <asm/processor.h> #include <asm/uaccess.h> +#include <asm/mach/time.h> extern const char *processor_modes[]; extern void setup_mm_for_reboot(char mode); @@ -85,8 +86,10 @@ EXPORT_SYMBOL(pm_power_off); void default_idle(void) { local_irq_disable(); - if (!need_resched() && !hlt_counter) + if (!need_resched() && !hlt_counter) { + timer_dyn_reprogram(); arch_idle(); + } local_irq_enable(); } |