Skip to content

Commit

Permalink
[PATCH] powerpc: implement missing jiffies64_to_cputime64()
Browse files Browse the repository at this point in the history
asm-powerpc/cputime.h doesn't declare jiffies64_to_cputime64() or
cputime64_sub(), and due to CONFIG_VIRT_CPU_ACCOUNTING it's not picking
up the definition from asm-generic like x86-64 & friends do.

Cc: Dave Jones <davej@redhat.com>
Cc: Andrew Morton <akpm@osdl.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
David Woodhouse authored and Linus Torvalds committed Jul 5, 2006
1 parent ba1826e commit a8e0c51
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions include/asm-powerpc/cputime.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ typedef u64 cputime64_t;

#define cputime64_zero ((cputime64_t)0)
#define cputime64_add(__a, __b) ((__a) + (__b))
#define cputime64_sub(__a, __b) ((__a) - (__b))
#define cputime_to_cputime64(__ct) (__ct)

#ifdef __KERNEL__
Expand Down Expand Up @@ -74,6 +75,23 @@ static inline cputime_t jiffies_to_cputime(const unsigned long jif)
return ct;
}

static inline cputime64_t jiffies64_to_cputime64(const u64 jif)
{
cputime_t ct;
u64 sec;

/* have to be a little careful about overflow */
ct = jif % HZ;
sec = jif / HZ;
if (ct) {
ct *= tb_ticks_per_sec;
do_div(ct, HZ);
}
if (sec)
ct += (cputime_t) sec * tb_ticks_per_sec;
return ct;
}

static inline u64 cputime64_to_jiffies64(const cputime_t ct)
{
return mulhdu(ct, __cputime_jiffies_factor);
Expand Down

0 comments on commit a8e0c51

Please sign in to comment.