hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] include: update jiffies/{m,u}secs conversion functions 

Clarify the human-time units to jiffies conversion functions by using the
constants in time.h.  This makes many of the subsequent patches direct
copies of the current code.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Nishanth Aravamudan 2005-09-10 00:27:22 -07:00 committed by Linus Torvalds
parent 64ed93a268
commit 84f902c090
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
include/linux/jiffies.h
View File

@ -254,23 +254,23 @@ static inline u64 get_jiffies_64(void)
*/ */
static inline unsigned int jiffies_to_msecs(const unsigned long j) static inline unsigned int jiffies_to_msecs(const unsigned long j)
{ {
#if HZ <= 1000 && !(1000 % HZ) #if HZ <= MSEC_PER_SEC && !(MSEC_PER_SEC % HZ)
return (1000 / HZ) * j; return (MSEC_PER_SEC / HZ) * j;
#elif HZ > 1000 && !(HZ % 1000) #elif HZ > MSEC_PER_SEC && !(HZ % MSEC_PER_SEC)
return (j + (HZ / 1000) - 1)/(HZ / 1000); return (j + (HZ / MSEC_PER_SEC) - 1)/(HZ / MSEC_PER_SEC);
#else #else
return (j * 1000) / HZ; return (j * MSEC_PER_SEC) / HZ;
#endif #endif
} }
static inline unsigned int jiffies_to_usecs(const unsigned long j) static inline unsigned int jiffies_to_usecs(const unsigned long j)
{ {
#if HZ <= 1000000 && !(1000000 % HZ) #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
return (1000000 / HZ) * j; return (USEC_PER_SEC / HZ) * j;
#elif HZ > 1000000 && !(HZ % 1000000) #elif HZ > USEC_PER_SEC && !(HZ % USEC_PER_SEC)
return (j + (HZ / 1000000) - 1)/(HZ / 1000000); return (j + (HZ / USEC_PER_SEC) - 1)/(HZ / USEC_PER_SEC);
#else #else
return (j * 1000000) / HZ; return (j * USEC_PER_SEC) / HZ;
#endif #endif
} }
@ -278,12 +278,12 @@ static inline unsigned long msecs_to_jiffies(const unsigned int m)
{ {
if (m > jiffies_to_msecs(MAX_JIFFY_OFFSET)) if (m > jiffies_to_msecs(MAX_JIFFY_OFFSET))
return MAX_JIFFY_OFFSET; return MAX_JIFFY_OFFSET;
#if HZ <= 1000 && !(1000 % HZ) #if HZ <= MSEC_PER_SEC && !(MSEC_PER_SEC % HZ)
return (m + (1000 / HZ) - 1) / (1000 / HZ); return (m + (MSEC_PER_SEC / HZ) - 1) / (MSEC_PER_SEC / HZ);
#elif HZ > 1000 && !(HZ % 1000) #elif HZ > MSEC_PER_SEC && !(HZ % MSEC_PER_SEC)
return m * (HZ / 1000); return m * (HZ / MSEC_PER_SEC);
#else #else
return (m * HZ + 999) / 1000; return (m * HZ + MSEC_PER_SEC - 1) / MSEC_PER_SEC;
#endif #endif
} }
@ -291,12 +291,12 @@ static inline unsigned long usecs_to_jiffies(const unsigned int u)
{ {
if (u > jiffies_to_usecs(MAX_JIFFY_OFFSET)) if (u > jiffies_to_usecs(MAX_JIFFY_OFFSET))
return MAX_JIFFY_OFFSET; return MAX_JIFFY_OFFSET;
#if HZ <= 1000000 && !(1000000 % HZ) #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
return (u + (1000000 / HZ) - 1) / (1000000 / HZ); return (u + (USEC_PER_SEC / HZ) - 1) / (USEC_PER_SEC / HZ);
#elif HZ > 1000000 && !(HZ % 1000000) #elif HZ > USEC_PER_SEC && !(HZ % USEC_PER_SEC)
return u * (HZ / 1000000); return u * (HZ / USEC_PER_SEC);
#else #else
return (u * HZ + 999999) / 1000000; return (u * HZ + USEC_PER_SEC - 1) / USEC_PER_SEC;
#endif #endif
} }

2
include/linux/time.h
View File

@ -28,6 +28,8 @@ struct timezone {
#ifdef __KERNEL__ #ifdef __KERNEL__
/* Parameters used to convert the timespec values */ /* Parameters used to convert the timespec values */
#define MSEC_PER_SEC (1000L)
#ifndef USEC_PER_SEC #ifndef USEC_PER_SEC
#define USEC_PER_SEC (1000000L) #define USEC_PER_SEC (1000000L)
#endif #endif