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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-s390
/
semaphore.h
diff --git
a/include/asm-s390/semaphore.h
b/include/asm-s390/semaphore.h
index
702cf43
..
32cdc69
100644
(file)
--- a/
include/asm-s390/semaphore.h
+++ b/
include/asm-s390/semaphore.h
@@
-37,7
+37,8
@@
struct semaphore {
static inline void sema_init (struct semaphore *sem, int val)
{
static inline void sema_init (struct semaphore *sem, int val)
{
- *sem = (struct semaphore) __SEMAPHORE_INITIALIZER((*sem),val);
+ atomic_set(&sem->count, val);
+ init_waitqueue_head(&sem->wait);
}
static inline void init_MUTEX (struct semaphore *sem)
}
static inline void init_MUTEX (struct semaphore *sem)