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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
asm-x86_64
/
spinlock.h
diff --git
a/include/asm-x86_64/spinlock.h
b/include/asm-x86_64/spinlock.h
index
a8e3d89
..
fe484a6
100644
(file)
--- a/
include/asm-x86_64/spinlock.h
+++ b/
include/asm-x86_64/spinlock.h
@@
-4,6
+4,7
@@
#include <asm/atomic.h>
#include <asm/rwlock.h>
#include <asm/page.h>
#include <asm/atomic.h>
#include <asm/rwlock.h>
#include <asm/page.h>
+#include <linux/config.h>
/*
* Your basic SMP spinlocks, allowing only a single CPU anywhere
/*
* Your basic SMP spinlocks, allowing only a single CPU anywhere
@@
-21,7
+22,7
@@
#define __raw_spin_lock_string \
"\n1:\t" \
#define __raw_spin_lock_string \
"\n1:\t" \
-
LOCK_PREFIX "
; decl %0\n\t" \
+
"lock
; decl %0\n\t" \
"js 2f\n" \
LOCK_SECTION_START("") \
"2:\t" \
"js 2f\n" \
LOCK_SECTION_START("") \
"2:\t" \
@@
-31,16
+32,15
@@
"jmp 1b\n" \
LOCK_SECTION_END
"jmp 1b\n" \
LOCK_SECTION_END
-#define __raw_spin_lock_string_up \
- "\n\tdecl %0"
-
#define __raw_spin_unlock_string \
"movl $1,%0" \
:"=m" (lock->slock) : : "memory"
static inline void __raw_spin_lock(raw_spinlock_t *lock)
{
#define __raw_spin_unlock_string \
"movl $1,%0" \
:"=m" (lock->slock) : : "memory"
static inline void __raw_spin_lock(raw_spinlock_t *lock)
{
- asm volatile(__raw_spin_lock_string : "=m" (lock->slock) : : "memory");
+ __asm__ __volatile__(
+ __raw_spin_lock_string
+ :"=m" (lock->slock) : : "memory");
}
#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
}
#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
@@
-79,6
+79,13
@@
static inline void __raw_spin_unlock(raw_spinlock_t *lock)
*
* On x86, we implement read-write locks as a 32-bit counter
* with the high bit (sign) being the "contended" bit.
*
* On x86, we implement read-write locks as a 32-bit counter
* with the high bit (sign) being the "contended" bit.
+ *
+ * The inline assembly is non-obvious. Think about it.
+ *
+ * Changed to use the same technique as rw semaphores. See
+ * semaphore.h for details. -ben
+ *
+ * the helpers are in arch/i386/kernel/semaphore.c
*/
#define __raw_read_can_lock(x) ((int)(x)->lock > 0)
*/
#define __raw_read_can_lock(x) ((int)(x)->lock > 0)
@@
-86,12
+93,12
@@
static inline void __raw_spin_unlock(raw_spinlock_t *lock)
static inline void __raw_read_lock(raw_rwlock_t *rw)
{
static inline void __raw_read_lock(raw_rwlock_t *rw)
{
- __build_read_lock(rw);
+ __build_read_lock(rw
, "__read_lock_failed"
);
}
static inline void __raw_write_lock(raw_rwlock_t *rw)
{
}
static inline void __raw_write_lock(raw_rwlock_t *rw)
{
- __build_write_lock(rw);
+ __build_write_lock(rw
, "__write_lock_failed"
);
}
static inline int __raw_read_trylock(raw_rwlock_t *lock)
}
static inline int __raw_read_trylock(raw_rwlock_t *lock)
@@
-115,12
+122,12
@@
static inline int __raw_write_trylock(raw_rwlock_t *lock)
static inline void __raw_read_unlock(raw_rwlock_t *rw)
{
static inline void __raw_read_unlock(raw_rwlock_t *rw)
{
- asm volatile(
LOCK_PREFIX "
; incl %0" :"=m" (rw->lock) : : "memory");
+ asm volatile(
"lock
; incl %0" :"=m" (rw->lock) : : "memory");
}
static inline void __raw_write_unlock(raw_rwlock_t *rw)
{
}
static inline void __raw_write_unlock(raw_rwlock_t *rw)
{
- asm volatile(
LOCK_PREFIX "
; addl $" RW_LOCK_BIAS_STR ",%0"
+ asm volatile(
"lock
; addl $" RW_LOCK_BIAS_STR ",%0"
: "=m" (rw->lock) : : "memory");
}
: "=m" (rw->lock) : : "memory");
}