diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-30 13:04:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-30 13:04:14 -0500 |
| commit | 7f8e3234c5f7fbdb06be050c8a1907e9c36d7c61 (patch) | |
| tree | d6e9edb2087fa4a97b2cc3d585a0189672a14cf4 /arch/s390 | |
| parent | 8ade06c616b34b4237c0ed77d1ff0ce04ad7d056 (diff) | |
| parent | 89307babf966165171547f105e2253dec261cfa5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/cputime.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/include/asm/cputime.h b/arch/s390/include/asm/cputime.h index 081434878296..b9acaaa175d8 100644 --- a/arch/s390/include/asm/cputime.h +++ b/arch/s390/include/asm/cputime.h | |||
| @@ -87,6 +87,8 @@ usecs_to_cputime(const unsigned int m) | |||
| 87 | return (cputime_t) m * 4096; | 87 | return (cputime_t) m * 4096; |
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | #define usecs_to_cputime64(m) usecs_to_cputime(m) | ||
| 91 | |||
| 90 | /* | 92 | /* |
| 91 | * Convert cputime to milliseconds and back. | 93 | * Convert cputime to milliseconds and back. |
| 92 | */ | 94 | */ |