D48379.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D48379.diff
View Options

	diff --git a/sys/compat/linuxkpi/common/include/linux/jiffies.h b/sys/compat/linuxkpi/common/include/linux/jiffies.h
	--- a/sys/compat/linuxkpi/common/include/linux/jiffies.h
	+++ b/sys/compat/linuxkpi/common/include/linux/jiffies.h
	@@ -68,19 +68,6 @@
	extern uint64_t lkpi_msec2hz_div;
	extern uint64_t lkpi_msec2hz_max;

	-static inline int
	-timespec_to_jiffies(const struct timespec *ts)
	-{
	- u64 result;
	-
	- result = ((u64)hz * ts->tv_sec) +
	- (((u64)hz * ts->tv_nsec + NSEC_PER_SEC - 1) / NSEC_PER_SEC);
	- if (result > MAX_JIFFY_OFFSET)
	- result = MAX_JIFFY_OFFSET;
	-
	- return ((int)result);
	-}
	-
	static inline int
	msecs_to_jiffies(uint64_t msec)
	{
	diff --git a/sys/dev/drm2/drm_os_freebsd.h b/sys/dev/drm2/drm_os_freebsd.h
	--- a/sys/dev/drm2/drm_os_freebsd.h
	+++ b/sys/dev/drm2/drm_os_freebsd.h
	@@ -447,7 +447,6 @@
	#define jiffies ticks
	#define jiffies_to_msecs(x) (((int64_t)(x)) * 1000 / hz)
	#define msecs_to_jiffies(x) (((int64_t)(x)) * hz / 1000)
	-#define timespec_to_jiffies(x) (((x)->tv_sec * 1000000 + (x)->tv_nsec) * hz / 1000000)
	#define time_after(a,b) ((long)(b) - (long)(a) < 0)
	#define time_after_eq(a,b) ((long)(b) - (long)(a) <= 0)
	#define round_jiffies(j) ((unsigned long)(((j) + drm_linux_timer_hz_mask) & ~drm_linux_timer_hz_mask))