diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 02:13:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 02:13:18 -0400 |
| commit | 2c10c22af088ab5d94fae93ce3fe6436b2a208b4 (patch) | |
| tree | db27721001f194327ddbdcd6c983c4ec68b77c00 /kernel/sched.c | |
| parent | f6121f4f8708195e88cbdf8dd8d171b226b3f858 (diff) | |
| parent | fec6ed1d1f9b78a6acb4a3eb2c46c812ac2e96f0 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index e1299de1765e..2caedc47e764 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -201,7 +201,7 @@ void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime) | |||
| 201 | hrtimer_init(&rt_b->rt_period_timer, | 201 | hrtimer_init(&rt_b->rt_period_timer, |
| 202 | CLOCK_MONOTONIC, HRTIMER_MODE_REL); | 202 | CLOCK_MONOTONIC, HRTIMER_MODE_REL); |
| 203 | rt_b->rt_period_timer.function = sched_rt_period_timer; | 203 | rt_b->rt_period_timer.function = sched_rt_period_timer; |
| 204 | rt_b->rt_period_timer.cb_mode = HRTIMER_CB_IRQSAFE_NO_SOFTIRQ; | 204 | rt_b->rt_period_timer.cb_mode = HRTIMER_CB_IRQSAFE_UNLOCKED; |
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | static inline int rt_bandwidth_enabled(void) | 207 | static inline int rt_bandwidth_enabled(void) |
| @@ -1124,7 +1124,7 @@ static void init_rq_hrtick(struct rq *rq) | |||
| 1124 | 1124 | ||
| 1125 | hrtimer_init(&rq->hrtick_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); | 1125 | hrtimer_init(&rq->hrtick_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); |
| 1126 | rq->hrtick_timer.function = hrtick; | 1126 | rq->hrtick_timer.function = hrtick; |
| 1127 | rq->hrtick_timer.cb_mode = HRTIMER_CB_IRQSAFE_NO_SOFTIRQ; | 1127 | rq->hrtick_timer.cb_mode = HRTIMER_CB_IRQSAFE_PERCPU; |
| 1128 | } | 1128 | } |
| 1129 | #else /* CONFIG_SCHED_HRTICK */ | 1129 | #else /* CONFIG_SCHED_HRTICK */ |
| 1130 | static inline void hrtick_clear(struct rq *rq) | 1130 | static inline void hrtick_clear(struct rq *rq) |