| From 7d700e22ae59cd605399d9dd050aaa35bd7e1dcf Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Sun, 23 Jan 2011 11:58:53 -0500 |
| Subject: [PATCH] PREEMPT_LOCK_OFFSET: force to zero on RT |
| |
| This is one of several extractions from the merge up to 33-rc8. |
| |
| See it in a git tip repo with: |
| |
| git diff 5f854cfc024622e4aae14d7cf422f6ff86278688^2 \ |
| 5f854cfc024622e4aae14d7cf422f6ff86278688 \ |
| include/linux/sched.h |
| |
| You can find the origin of this change in the tip merge commit: |
| |
| commit 5f854cfc024622e4aae14d7cf422f6ff86278688 |
| Merge: cc24da0 4ec62b2 |
| Author: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sun Feb 21 20:17:22 2010 +0100 |
| |
| Forward to 2.6.33-rc8 |
| |
| Merge branch 'linus' into rt/head with a pile of conflicts. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| Normally there are not significant changes/additions in a merge commit that |
| are not from any other "normal" commit. But in this case there are, so |
| break them out into separate explicit commits. |
| |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/include/linux/sched.h b/include/linux/sched.h |
| index eed1065..8dbd95c 100644 |
| --- a/include/linux/sched.h |
| +++ b/include/linux/sched.h |
| @@ -2525,7 +2525,7 @@ extern int _cond_resched(void); |
| |
| extern int __cond_resched_lock(spinlock_t *lock); |
| |
| -#ifdef CONFIG_PREEMPT |
| +#if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_RT) |
| #define PREEMPT_LOCK_OFFSET PREEMPT_OFFSET |
| #else |
| #define PREEMPT_LOCK_OFFSET 0 |
| -- |
| 1.7.1.1 |
| |