From 00e0a9c0c9508aa444d24fc6a6ed355ac306bf3d Mon Sep 17 00:00:00 2001
From: Tim Schmielau <tim@physik3.uni-rostock.de>
Date: Fri, 14 Oct 2005 15:59:05 -0700
Subject: [PATCH] --- yaml --- r: 9874 b: refs/heads/master c:
 e26148d934762b61133a64b6862f870624ff617d h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/acct.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 80dc6de3b31c..677553f52c30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1ac046d7b297186f755fb213589b539426e1406
+refs/heads/master: e26148d934762b61133a64b6862f870624ff617d
diff --git a/trunk/include/linux/acct.h b/trunk/include/linux/acct.h
index 1993a3691768..19f70462b3be 100644
--- a/trunk/include/linux/acct.h
+++ b/trunk/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));