diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-08-31 14:32:33 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-08-31 14:32:33 +1000 |
| commit | 2cd776673a43c2fbfdb0f90f79458880abad3f46 (patch) | |
| tree | e811ffb9eb26eec60afe1d763a917c68c2828e09 /include/asm-generic/cputime.h | |
| parent | dc978c7a7a2ceaa06db8d62ea5657d269376c98b (diff) | |
| parent | 64a8d94fbc0d7fe4e87ed41ecb1b4b9e05cc0efe (diff) | |
Merge branch 'akpm'
Diffstat (limited to 'include/asm-generic/cputime.h')
| -rw-r--r-- | include/asm-generic/cputime.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/cputime.h b/include/asm-generic/cputime.h index 61e03dd7939e..62ce6823c0f2 100644 --- a/include/asm-generic/cputime.h +++ b/include/asm-generic/cputime.h @@ -38,8 +38,8 @@ typedef u64 cputime64_t; /* * Convert cputime to microseconds and back. */ -#define cputime_to_usecs(__ct) jiffies_to_usecs(__ct); -#define usecs_to_cputime(__msecs) usecs_to_jiffies(__msecs); +#define cputime_to_usecs(__ct) jiffies_to_usecs(__ct) +#define usecs_to_cputime(__msecs) usecs_to_jiffies(__msecs) /* * Convert cputime to seconds and back. |