diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-18 15:37:27 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-18 15:37:27 +1000 |
| commit | 85e11dea0f44f898cf3a5a153ca6a63b33c4353b (patch) | |
| tree | d3f72f15abdcc4d35fcada6d595cc95d765e9e16 /net | |
| parent | 114f8d42acdac5bd646f2bf92e0b61b26d4b1420 (diff) | |
| parent | 75309eb294cd225617172ba00c18e3294a996773 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/pktgen.c | 2 | ||||
| -rw-r--r-- | net/sched/sch_api.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 62f979984a23..c84a7b445fcc 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -2263,8 +2263,6 @@ static void spin(struct pktgen_dev *pkt_dev, ktime_t spin_until) do { set_current_state(TASK_INTERRUPTIBLE); hrtimer_start_expires(&t.timer, HRTIMER_MODE_ABS); - if (!hrtimer_active(&t.timer)) - t.task = NULL; if (likely(t.task)) schedule(); diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 0b74dc0ede9c..d03b00e9dc24 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -1877,13 +1877,10 @@ EXPORT_SYMBOL(tcf_destroy_chain); #ifdef CONFIG_PROC_FS static int psched_show(struct seq_file *seq, void *v) { - struct timespec ts; - - hrtimer_get_res(CLOCK_MONOTONIC, &ts); seq_printf(seq, "%08x %08x %08x %08x\n", (u32)NSEC_PER_USEC, (u32)PSCHED_TICKS2NS(1), 1000000, - (u32)NSEC_PER_SEC/(u32)ktime_to_ns(timespec_to_ktime(ts))); + (u32)NSEC_PER_SEC / hrtimer_resolution); return 0; } |