| From dc25471c35016a69093a90a75d72db8c3542d7f7 Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Sun, 23 Jan 2011 12:54:23 -0500 |
| Subject: [PATCH] sparc: dont use SPIN_LOCK_UNLOCKED in rwsem init |
| |
| see for a similar example, upstream 969e46a8533a3e40ce2146f6764a963b1f5505da |
| |
| 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 \ |
| arch/sparc/include/asm/rwsem.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/arch/sparc/include/asm/rwsem.h b/arch/sparc/include/asm/rwsem.h |
| index 7a90aa2..663e48b 100644 |
| --- a/arch/sparc/include/asm/rwsem.h |
| +++ b/arch/sparc/include/asm/rwsem.h |
| @@ -96,8 +96,8 @@ struct rw_semaphore { |
| #endif |
| |
| #define __RWSEM_INITIALIZER(name) \ |
| -{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, LIST_HEAD_INIT((name).wait_list) \ |
| - __RWSEM_DEP_MAP_INIT(name) } |
| +{ RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock), \ |
| + LIST_HEAD_INIT((name).wait_list) __RWSEM_DEP_MAP_INIT(name) } |
| |
| #define DECLARE_RWSEM(name) \ |
| struct rw_semaphore name = __RWSEM_INITIALIZER(name) |
| -- |
| 1.7.1.1 |
| |