diff options
| author | Clark Williams <williams@redhat.com> | 2012-01-05 12:51:32 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-01-05 12:51:32 -0600 |
| commit | d76fe430665fac3f44ee88958713ecc524fd778d (patch) | |
| tree | 00206c8b11eb2084d38eeccfe4b41f5e89fb779c /arch/s390/include/asm/cputime.h | |
| parent | 63076d7f7f7f2650e5d0a4fa5dd2c412a255c237 (diff) | |
| parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) | |
Merge commit 'v3.2' into rt-3.2-rt9v3.2-rt9
Diffstat (limited to 'arch/s390/include/asm/cputime.h')
| -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) return (cputime_t) m * 4096; } +#define usecs_to_cputime64(m) usecs_to_cputime(m) + /* * Convert cputime to milliseconds and back. */ |