summaryrefslogtreecommitdiffstats
path: root/include/asm-generic/cputime.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-03-17 08:44:08 +0100
committerPaul Mundt <lethal@linux-sh.org>2011-03-17 08:44:08 +0100
commit1d2a1959fe534279cf37aba20b08c24c20840e52 (patch)
tree67c0b9aa7fe22a44bf0b4af88947799203eb8f67 /include/asm-generic/cputime.h
parentsh: update sh7757lcr_defconfig (diff)
parentMerge branch 'mnt_devname' of git://git.kernel.org/pub/scm/linux/kernel/git/v... (diff)
downloadlinux-1d2a1959fe534279cf37aba20b08c24c20840e52.tar.xz
linux-1d2a1959fe534279cf37aba20b08c24c20840e52.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'include/asm-generic/cputime.h')
-rw-r--r--include/asm-generic/cputime.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-generic/cputime.h b/include/asm-generic/cputime.h
index 2bcc5c7c22a6..61e03dd7939e 100644
--- a/include/asm-generic/cputime.h
+++ b/include/asm-generic/cputime.h
@@ -30,6 +30,9 @@ typedef u64 cputime64_t;
#define cputime64_to_jiffies64(__ct) (__ct)
#define jiffies64_to_cputime64(__jif) (__jif)
#define cputime_to_cputime64(__ct) ((u64) __ct)
+#define cputime64_gt(__a, __b) ((__a) > (__b))
+
+#define nsecs_to_cputime64(__ct) nsecs_to_jiffies64(__ct)
/*