diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2014-03-05 16:22:37 +0100 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2014-03-13 15:56:44 +0100 |
| commit | d8a9ce3f8ad2b546b9ebaf65de809da0793f11c5 (patch) | |
| tree | b135c1cbf8b3eb31e1ee58a7aa8b0f43f7f6a828 /include/asm-generic | |
| parent | bfc3f0281e08066fa8111c3972cff6edc1049864 (diff) | |
cputime: Bring cputime -> nsecs conversion
We already have nsecs_to_cputime(). Now we need to be able to convert
the other way around in order to fix a bug on steal time accounting.
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/cputime_jiffies.h | 4 | ||||
| -rw-r--r-- | include/asm-generic/cputime_nsecs.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-generic/cputime_jiffies.h b/include/asm-generic/cputime_jiffies.h index 272ecba9f58..d5cb78f5398 100644 --- a/include/asm-generic/cputime_jiffies.h +++ b/include/asm-generic/cputime_jiffies.h @@ -15,8 +15,10 @@ typedef u64 __nocast cputime64_t; /* - * Convert nanoseconds to cputime + * Convert nanoseconds <-> cputime */ +#define cputime_to_nsecs(__ct) \ + jiffies_to_nsecs(cputime_to_jiffies(__ct)) #define nsecs_to_cputime64(__nsec) \ jiffies64_to_cputime64(nsecs_to_jiffies64(__nsec)) #define nsecs_to_cputime(__nsec) \ diff --git a/include/asm-generic/cputime_nsecs.h b/include/asm-generic/cputime_nsecs.h index 768294f8bf8..4e817606c54 100644 --- a/include/asm-generic/cputime_nsecs.h +++ b/include/asm-generic/cputime_nsecs.h @@ -44,6 +44,8 @@ typedef u64 __nocast cputime64_t; /* * Convert cputime <-> nanoseconds */ +#define cputime_to_nsecs(__ct) \ + (__force u64)(__ct) #define nsecs_to_cputime(__nsecs) \ (__force cputime_t)(__nsecs) |