Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-12-30 13:04:14 -05:00
parent 8ade06c616 89307babf9
commit 7f8e3234c5
51 changed files with 356 additions and 172 deletions
@@ -40,6 +40,7 @@ typedef u64 cputime64_t;
 */
 #define cputime_to_usecs(__ct)		jiffies_to_usecs(__ct)
 #define usecs_to_cputime(__msecs)	usecs_to_jiffies(__msecs)
+#define usecs_to_cputime64(__msecs)	nsecs_to_jiffies64((__msecs) * 1000)

 /*
 * Convert cputime to seconds and back.