diff options
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/sch_api.c | 4 | ||||
-rw-r--r-- | net/sched/sch_cbq.c | 4 | ||||
-rw-r--r-- | net/sched/sch_htb.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index ca6248345937..15e7beee266c 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
@@ -586,7 +586,7 @@ static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer) | |||
586 | 586 | ||
587 | void qdisc_watchdog_init(struct qdisc_watchdog *wd, struct Qdisc *qdisc) | 587 | void qdisc_watchdog_init(struct qdisc_watchdog *wd, struct Qdisc *qdisc) |
588 | { | 588 | { |
589 | hrtimer_init(&wd->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); | 589 | hrtimer_init(&wd->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED); |
590 | wd->timer.function = qdisc_watchdog; | 590 | wd->timer.function = qdisc_watchdog; |
591 | wd->qdisc = qdisc; | 591 | wd->qdisc = qdisc; |
592 | } | 592 | } |
@@ -602,7 +602,7 @@ void qdisc_watchdog_schedule_ns(struct qdisc_watchdog *wd, u64 expires) | |||
602 | 602 | ||
603 | hrtimer_start(&wd->timer, | 603 | hrtimer_start(&wd->timer, |
604 | ns_to_ktime(expires), | 604 | ns_to_ktime(expires), |
605 | HRTIMER_MODE_ABS); | 605 | HRTIMER_MODE_ABS_PINNED); |
606 | } | 606 | } |
607 | EXPORT_SYMBOL(qdisc_watchdog_schedule_ns); | 607 | EXPORT_SYMBOL(qdisc_watchdog_schedule_ns); |
608 | 608 | ||
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index a3244a800501..d2cd981ba60d 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c | |||
@@ -617,7 +617,7 @@ static enum hrtimer_restart cbq_undelay(struct hrtimer *timer) | |||
617 | 617 | ||
618 | time = ktime_set(0, 0); | 618 | time = ktime_set(0, 0); |
619 | time = ktime_add_ns(time, PSCHED_TICKS2NS(now + delay)); | 619 | time = ktime_add_ns(time, PSCHED_TICKS2NS(now + delay)); |
620 | hrtimer_start(&q->delay_timer, time, HRTIMER_MODE_ABS); | 620 | hrtimer_start(&q->delay_timer, time, HRTIMER_MODE_ABS_PINNED); |
621 | } | 621 | } |
622 | 622 | ||
623 | qdisc_unthrottled(sch); | 623 | qdisc_unthrottled(sch); |
@@ -1386,7 +1386,7 @@ static int cbq_init(struct Qdisc *sch, struct nlattr *opt) | |||
1386 | q->link.minidle = -0x7FFFFFFF; | 1386 | q->link.minidle = -0x7FFFFFFF; |
1387 | 1387 | ||
1388 | qdisc_watchdog_init(&q->watchdog, sch); | 1388 | qdisc_watchdog_init(&q->watchdog, sch); |
1389 | hrtimer_init(&q->delay_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); | 1389 | hrtimer_init(&q->delay_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED); |
1390 | q->delay_timer.function = cbq_undelay; | 1390 | q->delay_timer.function = cbq_undelay; |
1391 | q->toplevel = TC_CBQ_MAXLEVEL; | 1391 | q->toplevel = TC_CBQ_MAXLEVEL; |
1392 | q->now = psched_get_time(); | 1392 | q->now = psched_get_time(); |
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 14408f262143..063e953d9848 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c | |||
@@ -932,7 +932,7 @@ ok: | |||
932 | ktime_t time = ns_to_ktime(next_event); | 932 | ktime_t time = ns_to_ktime(next_event); |
933 | qdisc_throttled(q->watchdog.qdisc); | 933 | qdisc_throttled(q->watchdog.qdisc); |
934 | hrtimer_start(&q->watchdog.timer, time, | 934 | hrtimer_start(&q->watchdog.timer, time, |
935 | HRTIMER_MODE_ABS); | 935 | HRTIMER_MODE_ABS_PINNED); |
936 | } | 936 | } |
937 | } else { | 937 | } else { |
938 | schedule_work(&q->work); | 938 | schedule_work(&q->work); |