git: d93c8a4d5a3f - stable/13 - LinuxKPI: Convert schedule() to inlined function
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 22 Jan 2022 19:36:24 UTC
The branch stable/13 has been updated by wulf:
URL: https://cgit.FreeBSD.org/src/commit/?id=d93c8a4d5a3fb47fc0d1d9bbd752df5128a2809b
commit d93c8a4d5a3fb47fc0d1d9bbd752df5128a2809b
Author: Vladimir Kondratyev <wulf@FreeBSD.org>
AuthorDate: 2021-12-03 15:12:50 +0000
Commit: Vladimir Kondratyev <wulf@FreeBSD.org>
CommitDate: 2022-01-22 19:34:36 +0000
LinuxKPI: Convert schedule() to inlined function
to prevent name clashing with drm-kmod
MFC after: 1 week
Reviewed by: hselasky, manu
Differential Revision: https://reviews.freebsd.org/D33294
(cherry picked from commit 7ec6cbf1d2fd104734ac8844d8c0bc1fdf50cb6d)
---
sys/compat/linuxkpi/common/include/linux/sched.h | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/sys/compat/linuxkpi/common/include/linux/sched.h b/sys/compat/linuxkpi/common/include/linux/sched.h
index 937e9f27870c..e99f58198fc5 100644
--- a/sys/compat/linuxkpi/common/include/linux/sched.h
+++ b/sys/compat/linuxkpi/common/include/linux/sched.h
@@ -161,8 +161,12 @@ linux_schedule_get_interrupt_value(struct task_struct *task)
return (value);
}
-#define schedule() \
- (void)linux_schedule_timeout(MAX_SCHEDULE_TIMEOUT)
+static inline void
+schedule(void)
+{
+ (void)linux_schedule_timeout(MAX_SCHEDULE_TIMEOUT);
+}
+
#define schedule_timeout(timeout) \
linux_schedule_timeout(timeout)
#define schedule_timeout_killable(timeout) \