Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-02-05 19:39:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix rt_mutex_lock_interruptible() again for RT >= 3.2

Browse Source
This commit is contained in:
Bjarne von Horn
2024-06-06 17:10:13 +02:00
parent d71e362a5e
commit 93b60bb812
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
master/ioctl.c
View File

@@ -62,7 +62,8 @@
#else #else
# define ec_ioctl_lock(lock) rt_mutex_lock(lock) # define ec_ioctl_lock(lock) rt_mutex_lock(lock)
# define ec_ioctl_unlock(lock) rt_mutex_unlock(lock) # define ec_ioctl_unlock(lock) rt_mutex_unlock(lock)
# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0) # if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0) || \
(defined(CONFIG_PREEMPT_RT_FULL) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
# define ec_ioctl_lock_interruptible(lock) \ # define ec_ioctl_lock_interruptible(lock) \
rt_mutex_lock_interruptible(lock) rt_mutex_lock_interruptible(lock)
# else # else

3
master/master.c
View File

@@ -52,7 +52,8 @@
#include "ethernet.h" #include "ethernet.h"
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0) || \
(defined(CONFIG_PREEMPT_RT_FULL) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
# define ec_rt_lock_interruptible(lock) \ # define ec_rt_lock_interruptible(lock) \
rt_mutex_lock_interruptible(lock) rt_mutex_lock_interruptible(lock)
#else #else