From d93c8a4d5a3fb47fc0d1d9bbd752df5128a2809b Mon Sep 17 00:00:00 2001 From: Vladimir Kondratyev Date: Fri, 3 Dec 2021 18:12:50 +0300 Subject: [PATCH] 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 937e9f27870..e99f58198fc 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) \