The branch main has been updated by wulf:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=7ec6cbf1d2fd104734ac8844d8c0bc1fdf50cb6d

commit 7ec6cbf1d2fd104734ac8844d8c0bc1fdf50cb6d
Author:     Vladimir Kondratyev <w...@freebsd.org>
AuthorDate: 2021-12-03 15:12:50 +0000
Commit:     Vladimir Kondratyev <w...@freebsd.org>
CommitDate: 2022-01-10 19:49:37 +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
---
 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 5954b16f6496..8f9ce5526e2c 100644
--- a/sys/compat/linuxkpi/common/include/linux/sched.h
+++ b/sys/compat/linuxkpi/common/include/linux/sched.h
@@ -162,8 +162,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)              \

Reply via email to