diff options
-rw-r--r-- | kernel/delayacct.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/kernel/delayacct.c b/kernel/delayacct.c index 54996b71e66d..de699f42f9bc 100644 --- a/kernel/delayacct.c +++ b/kernel/delayacct.c | |||
@@ -46,16 +46,6 @@ void __delayacct_tsk_init(struct task_struct *tsk) | |||
46 | } | 46 | } |
47 | 47 | ||
48 | /* | 48 | /* |
49 | * Start accounting for a delay statistic using | ||
50 | * its starting timestamp (@start) | ||
51 | */ | ||
52 | |||
53 | static inline void delayacct_start(struct timespec *start) | ||
54 | { | ||
55 | do_posix_clock_monotonic_gettime(start); | ||
56 | } | ||
57 | |||
58 | /* | ||
59 | * Finish delay accounting for a statistic using | 49 | * Finish delay accounting for a statistic using |
60 | * its timestamps (@start, @end), accumalator (@total) and @count | 50 | * its timestamps (@start, @end), accumalator (@total) and @count |
61 | */ | 51 | */ |
@@ -67,7 +57,7 @@ static void delayacct_end(struct timespec *start, struct timespec *end, | |||
67 | s64 ns; | 57 | s64 ns; |
68 | unsigned long flags; | 58 | unsigned long flags; |
69 | 59 | ||
70 | do_posix_clock_monotonic_gettime(end); | 60 | ktime_get_ts(end); |
71 | ts = timespec_sub(*end, *start); | 61 | ts = timespec_sub(*end, *start); |
72 | ns = timespec_to_ns(&ts); | 62 | ns = timespec_to_ns(&ts); |
73 | if (ns < 0) | 63 | if (ns < 0) |
@@ -81,7 +71,7 @@ static void delayacct_end(struct timespec *start, struct timespec *end, | |||
81 | 71 | ||
82 | void __delayacct_blkio_start(void) | 72 | void __delayacct_blkio_start(void) |
83 | { | 73 | { |
84 | delayacct_start(¤t->delays->blkio_start); | 74 | ktime_get_ts(¤t->delays->blkio_start); |
85 | } | 75 | } |
86 | 76 | ||
87 | void __delayacct_blkio_end(void) | 77 | void __delayacct_blkio_end(void) |
@@ -169,7 +159,7 @@ __u64 __delayacct_blkio_ticks(struct task_struct *tsk) | |||
169 | 159 | ||
170 | void __delayacct_freepages_start(void) | 160 | void __delayacct_freepages_start(void) |
171 | { | 161 | { |
172 | delayacct_start(¤t->delays->freepages_start); | 162 | ktime_get_ts(¤t->delays->freepages_start); |
173 | } | 163 | } |
174 | 164 | ||
175 | void __delayacct_freepages_end(void) | 165 | void __delayacct_freepages_end(void) |