git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: apic_64 - make calibrate_APIC_clock to return error code
[safe/jmp/linux-2.6]
/
include
/
asm-sh
/
spinlock_types.h
diff --git
a/include/asm-sh/spinlock_types.h
b/include/asm-sh/spinlock_types.h
index
5c58134
..
b4d244e
100644
(file)
--- a/
include/asm-sh/spinlock_types.h
+++ b/
include/asm-sh/spinlock_types.h
@@
-6,19
+6,16
@@
#endif
typedef struct {
#endif
typedef struct {
- volatile unsigned
long
lock;
+ volatile unsigned
int
lock;
} raw_spinlock_t;
} raw_spinlock_t;
-#define __RAW_SPIN_LOCK_UNLOCKED { 1 }
-
-#include <asm/atomic.h>
+#define __RAW_SPIN_LOCK_UNLOCKED { 1 }
typedef struct {
typedef struct {
- raw_spinlock_t lock;
- atomic_t counter;
+ volatile unsigned int lock;
} raw_rwlock_t;
#define RW_LOCK_BIAS 0x01000000
} raw_rwlock_t;
#define RW_LOCK_BIAS 0x01000000
-#define __RAW_RW_LOCK_UNLOCKED {
{ 0 }, { RW_LOCK_BIAS }
}
+#define __RAW_RW_LOCK_UNLOCKED {
RW_LOCK_BIAS
}
#endif
#endif