From e7e3f264f7b6c4b48288cc7a72198d3303fe96a4 Mon Sep 17 00:00:00 2001
From: ppisa <ppisa>
Date: Wed, 9 Aug 2006 14:02:44 +0000
Subject: [PATCH] Fix to behave correctly on latest real-time premptible
 kernels. preempt_disable() cannot be used there to boost thread priority
 temporarily.

---
 lincan/include/can_sysdep.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lincan/include/can_sysdep.h b/lincan/include/can_sysdep.h
index 5a3b86c..539a38e 100644
--- a/lincan/include/can_sysdep.h
+++ b/lincan/include/can_sysdep.h
@@ -167,7 +167,7 @@
 #define CAN_DEFINE_SPINLOCK        DEFINE_SPINLOCK
 #endif /*DEFINE_SPINLOCK*/
 
-#if defined(CONFIG_PREEMPT) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
+#if !defined(CONFIG_PREEMPT_RT) && ( defined(CONFIG_PREEMPT) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) )
 #define can_preempt_disable        preempt_disable
 #define can_preempt_enable         preempt_enable
 #else /*CONFIG_PREEMPT*/
-- 
2.39.2