Commit e26148d9 authored by Tim Schmielau's avatar Tim Schmielau Committed by Linus Torvalds

[PATCH] Fix copy-and-paste error in BSD accounting

Fix copy and paste error in jiffies_to_AHZ conversion which leads to wrong
BSD accounting information on alpha and ia64 when
CONFIG_BSD_PROCESS_ACCT_V3 is turned on.

Also update comment to match reorganised header files.
Signed-off-by: default avatarTim Schmielau <tim@physik3.uni-rostock.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f1ac046d
...@@ -162,13 +162,13 @@ typedef struct acct acct_t; ...@@ -162,13 +162,13 @@ typedef struct acct acct_t;
#ifdef __KERNEL__ #ifdef __KERNEL__
/* /*
* Yet another set of HZ to *HZ helper functions. * Yet another set of HZ to *HZ helper functions.
* See <linux/times.h> for the original. * See <linux/jiffies.h> for the original.
*/ */
static inline u32 jiffies_to_AHZ(unsigned long x) static inline u32 jiffies_to_AHZ(unsigned long x)
{ {
#if (TICK_NSEC % (NSEC_PER_SEC / AHZ)) == 0 #if (TICK_NSEC % (NSEC_PER_SEC / AHZ)) == 0
return x / (HZ / USER_HZ); return x / (HZ / AHZ);
#else #else
u64 tmp = (u64)x * TICK_NSEC; u64 tmp = (u64)x * TICK_NSEC;
do_div(tmp, (NSEC_PER_SEC / AHZ)); do_div(tmp, (NSEC_PER_SEC / AHZ));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment