summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Schmielau <tim@physik3.uni-rostock.de>2005-10-15 00:59:05 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-15 02:10:12 +0200
commite26148d934762b61133a64b6862f870624ff617d (patch)
tree1387c6dfb62cf20447e08f26ceb757bb28d4d0c0
parent[PATCH] radio-cadet: check request_region() return value correctly (diff)
downloadlinux-e26148d934762b61133a64b6862f870624ff617d.tar.xz
linux-e26148d934762b61133a64b6862f870624ff617d.zip
[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: Tim Schmielau <tim@physik3.uni-rostock.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/acct.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/acct.h b/include/linux/acct.h
index 1993a3691768..19f70462b3be 100644
--- a/include/linux/acct.h
+++ b/include/linux/acct.h
@@ -162,13 +162,13 @@ typedef struct acct acct_t;
#ifdef __KERNEL__
/*
* 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)
{
#if (TICK_NSEC % (NSEC_PER_SEC / AHZ)) == 0
- return x / (HZ / USER_HZ);
+ return x / (HZ / AHZ);
#else
u64 tmp = (u64)x * TICK_NSEC;
do_div(tmp, (NSEC_PER_SEC / AHZ));