| From 3c02eea98100ae3da3f838536fab56df8f849e40 Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Sun, 23 Jan 2011 15:27:40 -0500 |
| Subject: [PATCH] spinlock: fix compile failures for !PREEMPT_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 \ |
| kernel/spinlock.c |
| |
| 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/spinlock_api_smp.h b/include/linux/spinlock_api_smp.h |
| index e253ccd..efe395f 100644 |
| --- a/include/linux/spinlock_api_smp.h |
| +++ b/include/linux/spinlock_api_smp.h |
| @@ -191,6 +191,8 @@ static inline int __raw_spin_trylock_bh(raw_spinlock_t *lock) |
| return 0; |
| } |
| |
| +#ifndef CONFIG_PREEMPT_RT |
| #include <linux/rwlock_api_smp.h> |
| +#endif |
| |
| #endif /* __LINUX_SPINLOCK_API_SMP_H */ |
| diff --git a/kernel/spinlock.c b/kernel/spinlock.c |
| index be6517f..e1d9b78 100644 |
| --- a/kernel/spinlock.c |
| +++ b/kernel/spinlock.c |
| @@ -110,8 +110,11 @@ void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock) \ |
| * __[spin|read|write]_lock_bh() |
| */ |
| BUILD_LOCK_OPS(spin, raw_spinlock); |
| + |
| +#ifndef CONFIG_PREEMPT_RT |
| BUILD_LOCK_OPS(read, rwlock); |
| BUILD_LOCK_OPS(write, rwlock); |
| +#endif |
| |
| #endif |
| |
| @@ -195,6 +198,8 @@ void __lockfunc _raw_spin_unlock_bh(raw_spinlock_t *lock) |
| EXPORT_SYMBOL(_raw_spin_unlock_bh); |
| #endif |
| |
| +#ifndef CONFIG_PREEMPT_RT |
| + |
| #ifndef CONFIG_INLINE_READ_TRYLOCK |
| int __lockfunc _raw_read_trylock(rwlock_t *lock) |
| { |
| @@ -339,6 +344,8 @@ void __lockfunc _raw_write_unlock_bh(rwlock_t *lock) |
| EXPORT_SYMBOL(_raw_write_unlock_bh); |
| #endif |
| |
| +#endif /* !PREEMPT_RT */ |
| + |
| #ifdef CONFIG_DEBUG_LOCK_ALLOC |
| |
| void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass) |
| -- |
| 1.7.1.1 |
| |