projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-sh
/
spinlock_types.h
diff --git
a/include/asm-sh/spinlock_types.h
b/include/asm-sh/spinlock_types.h
index 8c41b6c3aac87adc4fbd73d5320b95e7592c6b18..b4d244e7b60ca7532f7193e7365a9a67a293482f 100644
(file)
--- a/
include/asm-sh/spinlock_types.h
+++ b/
include/asm-sh/spinlock_types.h
@@
-6,17
+6,16
@@
#endif
typedef struct {
#endif
typedef struct {
- volatile unsigned
long
lock;
+ volatile unsigned
int
lock;
} raw_spinlock_t;
} raw_spinlock_t;
-#define __
SPIN_LOCK_UNLOCKED { 0
}
+#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