git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
asm-arm
/
spinlock.h
diff --git
a/include/asm-arm/spinlock.h
b/include/asm-arm/spinlock.h
index
1c22e7f
..
1823236
100644
(file)
--- a/
include/asm-arm/spinlock.h
+++ b/
include/asm-arm/spinlock.h
@@
-17,6
+17,9
@@
*/
typedef struct {
volatile unsigned int lock;
*/
typedef struct {
volatile unsigned int lock;
+#ifdef CONFIG_PREEMPT
+ unsigned int break_lock;
+#endif
} spinlock_t;
#define SPIN_LOCK_UNLOCKED (spinlock_t) { 0 }
} spinlock_t;
#define SPIN_LOCK_UNLOCKED (spinlock_t) { 0 }
@@
-70,6
+73,9
@@
static inline void _raw_spin_unlock(spinlock_t *lock)
*/
typedef struct {
volatile unsigned int lock;
*/
typedef struct {
volatile unsigned int lock;
+#ifdef CONFIG_PREEMPT
+ unsigned int break_lock;
+#endif
} rwlock_t;
#define RW_LOCK_UNLOCKED (rwlock_t) { 0 }
} rwlock_t;
#define RW_LOCK_UNLOCKED (rwlock_t) { 0 }
@@
-143,6
+149,8
@@
static inline void _raw_read_unlock(rwlock_t *rw)
: "cc", "memory");
}
: "cc", "memory");
}
+#define _raw_read_trylock(lock) generic_raw_read_trylock(lock)
+
static inline int _raw_write_trylock(rwlock_t *rw)
{
unsigned long tmp;
static inline int _raw_write_trylock(rwlock_t *rw)
{
unsigned long tmp;