diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-27 07:54:08 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-27 07:54:08 -0400 |
| commit | eda3d8f5604860aae1bb9996bb5efc4213778369 (patch) | |
| tree | 9d3887d2665bcc5f5abf200758794545c7b2c69b /arch/um/kernel/process.c | |
| parent | 87a9f704658a40940e740b1d73d861667e9164d3 (diff) | |
| parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) | |
Merge commit 'upstream/master'
Diffstat (limited to 'arch/um/kernel/process.c')
| -rw-r--r-- | arch/um/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 83603cfbde81..a1c6d07cac3e 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c | |||
| @@ -243,7 +243,7 @@ void default_idle(void) | |||
| 243 | if (need_resched()) | 243 | if (need_resched()) |
| 244 | schedule(); | 244 | schedule(); |
| 245 | 245 | ||
| 246 | tick_nohz_stop_sched_tick(); | 246 | tick_nohz_stop_sched_tick(1); |
| 247 | nsecs = disable_timer(); | 247 | nsecs = disable_timer(); |
| 248 | idle_sleep(nsecs); | 248 | idle_sleep(nsecs); |
| 249 | tick_nohz_restart_sched_tick(); | 249 | tick_nohz_restart_sched_tick(); |