From: Tim Schmielau <tim@physik3.uni-rostock.de>
Date: Fri, 14 Oct 2005 22:59:05 +0000 (-0700)
Subject: [PATCH] Fix copy-and-paste error in BSD accounting
X-Git-Tag: v2.6.14-rc5~54
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e26148d934762b61133a64b6862f870624ff617d;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/include/linux/acct.h b/include/linux/acct.h
index 1993a369176..19f70462b3b 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));