aboutsummaryrefslogtreecommitdiff
path: root/sys/compat/linuxkpi/common/include/linux
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2025-05-12 13:39:27 +0000
committerMark Johnston <markj@FreeBSD.org>2025-05-12 14:08:39 +0000
commiteed3be47967f0ac8268d1655f57bc302c123e991 (patch)
treee2f0e2070a986b6894d8d6aa6452b080db1de79f /sys/compat/linuxkpi/common/include/linux
parent909aa6781340f8c0b4ae01c6366bf1556ee2d1be (diff)
Diffstat (limited to 'sys/compat/linuxkpi/common/include/linux')
-rw-r--r--sys/compat/linuxkpi/common/include/linux/jiffies.h11
-rw-r--r--sys/compat/linuxkpi/common/include/linux/workqueue.h2
2 files changed, 1 insertions, 12 deletions
diff --git a/sys/compat/linuxkpi/common/include/linux/jiffies.h b/sys/compat/linuxkpi/common/include/linux/jiffies.h
index df6ca129b37c..c2409726e874 100644
--- a/sys/compat/linuxkpi/common/include/linux/jiffies.h
+++ b/sys/compat/linuxkpi/common/include/linux/jiffies.h
@@ -140,15 +140,4 @@ get_jiffies_64(void)
return ((uint64_t)jiffies);
}
-static inline unsigned long
-linux_timer_jiffies_until(unsigned long expires)
-{
- unsigned long delta = expires - jiffies;
-
- /* guard against already expired values */
- if ((long)delta < 1)
- delta = 1;
- return (delta);
-}
-
#endif /* _LINUXKPI_LINUX_JIFFIES_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/workqueue.h b/sys/compat/linuxkpi/common/include/linux/workqueue.h
index 25ee861d3015..66d3981d4229 100644
--- a/sys/compat/linuxkpi/common/include/linux/workqueue.h
+++ b/sys/compat/linuxkpi/common/include/linux/workqueue.h
@@ -90,7 +90,7 @@ struct delayed_work {
struct {
struct callout callout;
struct mtx mtx;
- long expires;
+ unsigned long expires;
} timer;
};