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 | ipv6: Fix neigh lookup using NULL device. (diff) | |
| parent | Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu (diff) | |
| download | linux-dev-7f8e3234c5f7fbdb06be050c8a1907e9c36d7c61.tar.xz linux-dev-7f8e3234c5f7fbdb06be050c8a1907e9c36d7c61.zip | |
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) return (cputime_t) m * 4096; } +#define usecs_to_cputime64(m) usecs_to_cputime(m) + /* * Convert cputime to milliseconds and back. */ |