From: Ingo Molnar Date: Mon, 6 Oct 2008 06:13:18 +0000 (+0200) Subject: Merge branch 'linus' into sched/devel X-Git-Tag: v2.6.28-rc1~725^2~2^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2c10c22af088ab5d94fae93ce3fe6436b2a208b4;p=linux-2.6-omap-h63xx.git Merge branch 'linus' into sched/devel --- 2c10c22af088ab5d94fae93ce3fe6436b2a208b4 diff --cc kernel/sched.c index e1299de1765,ad1962dc0aa..2caedc47e76 --- a/kernel/sched.c +++ b/kernel/sched.c @@@ -201,14 -201,9 +201,14 @@@ void init_rt_bandwidth(struct rt_bandwi hrtimer_init(&rt_b->rt_period_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); rt_b->rt_period_timer.function = sched_rt_period_timer; - rt_b->rt_period_timer.cb_mode = HRTIMER_CB_IRQSAFE_NO_SOFTIRQ; + rt_b->rt_period_timer.cb_mode = HRTIMER_CB_IRQSAFE_UNLOCKED; } +static inline int rt_bandwidth_enabled(void) +{ + return sysctl_sched_rt_runtime >= 0; +} + static void start_rt_bandwidth(struct rt_bandwidth *rt_b) { ktime_t now; @@@ -1124,9 -1119,9 +1124,9 @@@ static void init_rq_hrtick(struct rq *r hrtimer_init(&rq->hrtick_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); rq->hrtick_timer.function = hrtick; - rq->hrtick_timer.cb_mode = HRTIMER_CB_IRQSAFE_NO_SOFTIRQ; + rq->hrtick_timer.cb_mode = HRTIMER_CB_IRQSAFE_PERCPU; } -#else +#else /* CONFIG_SCHED_HRTICK */ static inline void hrtick_clear(struct rq *rq) { }