From: Thomas Gleixner Date: Sun, 17 Jul 2011 22:51:33 +0200 Subject: [PATCH 111/351] sched: Use the proper LOCK_OFFSET for cond_resched() Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=4951308b85f29382d1cf1f29287bf908dd20c9f9 RT does not increment preempt count when a 'sleeping' spinlock is locked. Update PREEMPT_LOCK_OFFSET for that case. Signed-off-by: Thomas Gleixner --- include/linux/preempt.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/preempt.h b/include/linux/preempt.h index f7a17fcc3fec..b7fe717eb1f4 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h @@ -118,7 +118,11 @@ /* * The preempt_count offset after spin_lock() */ +#if !defined(CONFIG_PREEMPT_RT_FULL) #define PREEMPT_LOCK_OFFSET PREEMPT_DISABLE_OFFSET +#else +#define PREEMPT_LOCK_OFFSET 0 +#endif /* * The preempt_count offset needed for things like: