Fix to behave correctly on latest real-time premptible kernels.

[lincan.git] / lincan / include / can_sysdep.h

diff --git a/lincan/include/can_sysdep.h b/lincan/include/can_sysdep.h
index 5a3b86cdd922a53a4d52f274416c9eb4800ef3fd..539a38e78b563b7e8b761b858124cd98c2b04a4f 100644 (file)
--- 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*/