1 files changed, 33 insertions, 22 deletions

diff --git a/sys/compat/linuxkpi/common/include/linux/jiffies.h b/sys/compat/linuxkpi/common/include/linux/jiffies.h
index 6813ea7a3010..c8fc57725e54 100644
--- a/sys/compat/linuxkpi/common/include/linux/jiffies.h
+++ b/sys/compat/linuxkpi/common/include/linux/jiffies.h
@@ -54,6 +54,18 @@
 
 #define	HZ	hz
 
+extern uint64_t lkpi_nsec2hz_rem;
+extern uint64_t lkpi_nsec2hz_div;
+extern uint64_t lkpi_nsec2hz_max;
+
+extern uint64_t lkpi_usec2hz_rem;
+extern uint64_t lkpi_usec2hz_div;
+extern uint64_t lkpi_usec2hz_max;
+
+extern uint64_t lkpi_msec2hz_rem;
+extern uint64_t lkpi_msec2hz_div;
+extern uint64_t lkpi_msec2hz_max;
+
 static inline int
 timespec_to_jiffies(const struct timespec *ts)
 {
@@ -70,12 +82,11 @@ timespec_to_jiffies(const struct timespec *ts)
 static inline int
 msecs_to_jiffies(uint64_t msec)
 {
-	uint64_t msec_max, result;
+	uint64_t result;
 
-	msec_max = -1ULL / (uint64_t)hz;
-	if (msec > msec_max)
-		msec = msec_max;
-	result = howmany(msec * (uint64_t)hz, 1000ULL);
+	if (msec > lkpi_msec2hz_max)
+		msec = lkpi_msec2hz_max;
+	result = howmany(msec * lkpi_msec2hz_rem, lkpi_msec2hz_div);
 	if (result > MAX_JIFFY_OFFSET)
 		result = MAX_JIFFY_OFFSET;
 
@@ -85,12 +96,11 @@ msecs_to_jiffies(uint64_t msec)
 static inline int
 usecs_to_jiffies(uint64_t usec)
 {
-	uint64_t usec_max, result;
+	uint64_t result;
 
-	usec_max = -1ULL / (uint64_t)hz;
-	if (usec > usec_max)
-		usec = usec_max;
-	result = howmany(usec * (uint64_t)hz, 1000000ULL);
+	if (usec > lkpi_usec2hz_max)
+		usec = lkpi_usec2hz_max;
+	result = howmany(usec * lkpi_usec2hz_rem, lkpi_usec2hz_div);
 	if (result > MAX_JIFFY_OFFSET)
 		result = MAX_JIFFY_OFFSET;
 
@@ -100,23 +110,24 @@ usecs_to_jiffies(uint64_t usec)
 static inline uint64_t
 nsecs_to_jiffies64(uint64_t nsec)
 {
-	uint64_t nsec_max, result;
 
-	nsec_max = -1ULL / (uint64_t)hz;
-	if (nsec > nsec_max)
-		nsec = nsec_max;
-	result = howmany(nsec * (uint64_t)hz, 1000000000ULL);
-	if (result > MAX_JIFFY_OFFSET)
-		result = MAX_JIFFY_OFFSET;
-
-	return (result);
+	if (nsec > lkpi_nsec2hz_max)
+		nsec = lkpi_nsec2hz_max;
+	return (howmany(nsec * lkpi_nsec2hz_rem, lkpi_nsec2hz_div));
 }
 
-static inline uint64_t
-nsecs_to_jiffies(uint64_t n)
+static inline unsigned long
+nsecs_to_jiffies(uint64_t nsec)
 {
 
-	return (usecs_to_jiffies(howmany(n, 1000ULL)));
+	if (sizeof(unsigned long) >= sizeof(uint64_t)) {
+		if (nsec > lkpi_nsec2hz_max)
+			nsec = lkpi_nsec2hz_max;
+	} else {
+		if (nsec > (lkpi_nsec2hz_max >> 32))
+			nsec = (lkpi_nsec2hz_max >> 32);
+	}
+	return (howmany(nsec * lkpi_nsec2hz_rem, lkpi_nsec2hz_div));
 }
 
 static inline uint64_t