[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-b5d7682533941edb121f7495bdb2a17abac03ff3@git.kernel.org>
Date: Sat, 21 Jun 2014 13:36:47 -0700
From: tip-bot for Thomas Gleixner <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, john.stultz@...aro.org,
hpa@...or.com, mingo@...nel.org, peterz@...radead.org,
tglx@...utronix.de
Subject: [tip:timers/core] delayacct: Use ktime_get_ts()
Commit-ID: b5d7682533941edb121f7495bdb2a17abac03ff3
Gitweb: http://git.kernel.org/tip/b5d7682533941edb121f7495bdb2a17abac03ff3
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Wed, 11 Jun 2014 23:59:13 +0000
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Thu, 12 Jun 2014 16:18:45 +0200
delayacct: Use ktime_get_ts()
do_posix_clock_monotonic_gettime() is a leftover from the initial
posix timer implementation which maps to ktime_get_ts(). Remove the
silly wrapper while at it.
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Cc: John Stultz <john.stultz@...aro.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Link: http://lkml.kernel.org/r/20140611234606.931409215@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
kernel/delayacct.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/kernel/delayacct.c b/kernel/delayacct.c
index 54996b7..de699f4 100644
--- a/kernel/delayacct.c
+++ b/kernel/delayacct.c
@@ -46,16 +46,6 @@ void __delayacct_tsk_init(struct task_struct *tsk)
}
/*
- * Start accounting for a delay statistic using
- * its starting timestamp (@start)
- */
-
-static inline void delayacct_start(struct timespec *start)
-{
- do_posix_clock_monotonic_gettime(start);
-}
-
-/*
* Finish delay accounting for a statistic using
* its timestamps (@start, @end), accumalator (@total) and @count
*/
@@ -67,7 +57,7 @@ static void delayacct_end(struct timespec *start, struct timespec *end,
s64 ns;
unsigned long flags;
- do_posix_clock_monotonic_gettime(end);
+ ktime_get_ts(end);
ts = timespec_sub(*end, *start);
ns = timespec_to_ns(&ts);
if (ns < 0)
@@ -81,7 +71,7 @@ static void delayacct_end(struct timespec *start, struct timespec *end,
void __delayacct_blkio_start(void)
{
- delayacct_start(¤t->delays->blkio_start);
+ ktime_get_ts(¤t->delays->blkio_start);
}
void __delayacct_blkio_end(void)
@@ -169,7 +159,7 @@ __u64 __delayacct_blkio_ticks(struct task_struct *tsk)
void __delayacct_freepages_start(void)
{
- delayacct_start(¤t->delays->freepages_start);
+ ktime_get_ts(¤t->delays->freepages_start);
}
void __delayacct_freepages_end(void)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists