diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-08 18:17:25 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-08 18:17:25 -0400 |
| commit | cdbb92b31d3c465aa96bd09f2d42c39b87b32bee (patch) | |
| tree | 370e29681529882d7e4c766a19f0612885583464 /kernel/time/tick-sched.c | |
| parent | 2ec2b482b10a1ed3493c224f1893cddd3d33833b (diff) | |
| parent | 69849375d6b13e94d08cdc94b49b11fbab454a0e (diff) | |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'kernel/time/tick-sched.c')
| -rw-r--r-- | kernel/time/tick-sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 39019b3f7621..cb02324bdb88 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c | |||
| @@ -625,7 +625,7 @@ void tick_setup_sched_timer(void) | |||
| 625 | */ | 625 | */ |
| 626 | hrtimer_init(&ts->sched_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); | 626 | hrtimer_init(&ts->sched_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); |
| 627 | ts->sched_timer.function = tick_sched_timer; | 627 | ts->sched_timer.function = tick_sched_timer; |
| 628 | ts->sched_timer.cb_mode = HRTIMER_CB_IRQSAFE_NO_SOFTIRQ; | 628 | ts->sched_timer.cb_mode = HRTIMER_CB_IRQSAFE_PERCPU; |
| 629 | 629 | ||
| 630 | /* Get the next period (per cpu) */ | 630 | /* Get the next period (per cpu) */ |
| 631 | ts->sched_timer.expires = tick_init_jiffy_update(); | 631 | ts->sched_timer.expires = tick_init_jiffy_update(); |