From 7531b24965aed029d8ef105e18cb9741c6c58d36 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 10 Oct 2007 16:32:41 -0700
Subject: [PATCH] --- yaml --- r: 67052 b: refs/heads/master c:
 3c0cfc135829b98f7a4894938652f9ef78e24237 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/sched/sch_api.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f34cb7a1c2c2..09728f4cd13f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32d1316b91424423d7b44944f18cdaca268f3db2
+refs/heads/master: 3c0cfc135829b98f7a4894938652f9ef78e24237
diff --git a/trunk/net/sched/sch_api.c b/trunk/net/sched/sch_api.c
index 39d32780c80b..8ae137e3522b 100644
--- a/trunk/net/sched/sch_api.c
+++ b/trunk/net/sched/sch_api.c
@@ -1226,10 +1226,13 @@ 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_US2NS(1),
 		   1000000,
-		   (u32)NSEC_PER_SEC/(u32)ktime_to_ns(KTIME_MONOTONIC_RES));
+		   (u32)NSEC_PER_SEC/(u32)ktime_to_ns(timespec_to_ktime(ts)));
 
 	return 0;
 }