projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'release', 'misc' and 'misc-2.6.25' into release
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
acct.h
diff --git
a/include/linux/acct.h
b/include/linux/acct.h
index 302eb727ecb85dc7dec0db126c9a5d5240d8194b..e8cae54e8d88b9116d4813771978f2acecc58bf2 100644
(file)
--- a/
include/linux/acct.h
+++ b/
include/linux/acct.h
@@
-173,7
+173,11
@@
typedef struct acct acct_t;
static inline u32 jiffies_to_AHZ(unsigned long x)
{
#if (TICK_NSEC % (NSEC_PER_SEC / AHZ)) == 0
+# if HZ < AHZ
+ return x * (AHZ / HZ);
+# else
return x / (HZ / AHZ);
+# endif
#else
u64 tmp = (u64)x * TICK_NSEC;
do_div(tmp, (NSEC_PER_SEC / AHZ));