From d570f62243dda16d2b04d2454e576f11b57e7796 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Fri, 24 Jul 2009 20:05:23 +0200 Subject: [PATCH] --- yaml --- r: 158330 b: refs/heads/master c: 716a42348cdaf04534b15fbdc9c83e25baebfed5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/sched.h | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ed0dd7f86526..5a8ce11cec73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a004cd42181409eda70804ded240a791f4564d61 +refs/heads/master: 716a42348cdaf04534b15fbdc9c83e25baebfed5 diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index cbbfca69aa4a..c472414953bf 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -2293,8 +2293,14 @@ extern int _cond_resched(void); extern int __cond_resched_lock(spinlock_t *lock); +#ifdef CONFIG_PREEMPT +#define PREEMPT_LOCK_OFFSET PREEMPT_OFFSET +#else +#define PREEMPT_LOCK_OFFSET 0 +#endif + #define cond_resched_lock(lock) ({ \ - __might_sleep(__FILE__, __LINE__, PREEMPT_OFFSET); \ + __might_sleep(__FILE__, __LINE__, PREEMPT_LOCK_OFFSET); \ __cond_resched_lock(lock); \ })