From: ppisa Date: Wed, 9 Aug 2006 12:02:00 +0000 (+0200) Subject: Merge: Fix to behave correctly on latest real-time premptible kernels. X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/0b41f15382d34e25ee7dd26ef3ca51ca9137a5f4?hp=fe62fbd606ca30a701908ac064a56fced2555831 Merge: Fix to behave correctly on latest real-time premptible kernels. Merge commit 'remotes/sf-ocera-lincan/master' --- 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*/