summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2011-01-30 14:10:50 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-01-30 14:10:50 -0500
commit3ad0475d574b51308b78aa3c8ceef1f38b66e7fd (patch)
treebc0b3459c8b321ea28986c8b553b9aeda8e84af2
parent5d8b409c75e8994d8f57ae8fdf7179633b776f69 (diff)
downloadrt-patches-3ad0475d574b51308b78aa3c8ceef1f38b66e7fd.tar.gz
refresh rwsem-Make-inner-lock-raw.patchv2.6.33-1815-gf6a0b5cv2.6.33-1811-gd6cd471
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--rwsem-Make-inner-lock-raw.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/rwsem-Make-inner-lock-raw.patch b/rwsem-Make-inner-lock-raw.patch
index eaf6b28..2f7c171 100644
--- a/rwsem-Make-inner-lock-raw.patch
+++ b/rwsem-Make-inner-lock-raw.patch
@@ -1,4 +1,4 @@
-From 835a02885cd968b830ad9c2c87b8b12648fc6b5d Mon Sep 17 00:00:00 2001
+From 52c26280214fa7a1ecf0559387a3d2ec971e0423 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 24 Feb 2010 09:54:54 +0100
Subject: [PATCH] rwsem: Make inner lock raw
@@ -52,19 +52,19 @@ index c2494d4..accf580 100644
#define DECLARE_RWSEM(name) \
diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
-index 92d67a6..6051918 100644
+index 286cba2..42f8a37 100644
--- a/arch/x86/include/asm/rwsem.h
+++ b/arch/x86/include/asm/rwsem.h
-@@ -66,7 +66,7 @@ extern asmregparm struct rw_anon_semaphore *
+@@ -78,7 +78,7 @@ typedef signed long rwsem_count_t;
struct rw_anon_semaphore {
- signed long count;
+ rwsem_count_t count;
- spinlock_t wait_lock;
+ raw_spinlock_t wait_lock;
struct list_head wait_list;
#ifdef CONFIG_DEBUG_LOCK_ALLOC
struct lockdep_map dep_map;
-@@ -81,7 +81,7 @@ struct rw_anon_semaphore {
+@@ -93,7 +93,7 @@ struct rw_anon_semaphore {
#define __RWSEM_ANON_INITIALIZER(name) \
{ \
@@ -73,7 +73,7 @@ index 92d67a6..6051918 100644
LIST_HEAD_INIT((name).wait_list) __RWSEM_DEP_MAP_INIT(name) \
}
-@@ -265,7 +265,7 @@ static inline int anon_rwsem_is_locked(struct rw_anon_semaphore *sem)
+@@ -282,7 +282,7 @@ static inline int anon_rwsem_is_locked(struct rw_anon_semaphore *sem)
struct rw_semaphore {
signed long count;
@@ -82,7 +82,7 @@ index 92d67a6..6051918 100644
struct list_head wait_list;
#ifdef CONFIG_DEBUG_LOCK_ALLOC
struct lockdep_map dep_map;
-@@ -279,7 +279,7 @@ struct rw_semaphore {
+@@ -296,7 +296,7 @@ struct rw_semaphore {
#endif
#define __RWSEM_INITIALIZER(name) \
@@ -350,5 +350,5 @@ index 72eaba5..47f5a75 100644
return sem;
}
--
-1.7.1.1
+1.7.4