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]
/
drivers
/
s390
/
cio
/
cio.h
diff --git
a/drivers/s390/cio/cio.h
b/drivers/s390/cio/cio.h
index
0ca9873
..
4541c1a
100644
(file)
--- a/
drivers/s390/cio/cio.h
+++ b/
drivers/s390/cio/cio.h
@@
-2,6
+2,7
@@
#define S390_CIO_H
#include "schid.h"
#define S390_CIO_H
#include "schid.h"
+#include <linux/mutex.h>
/*
* where we put the ssd info
/*
* where we put the ssd info
@@
-87,7
+88,7
@@
struct orb {
struct subchannel {
struct subchannel_id schid;
spinlock_t lock; /* subchannel lock */
struct subchannel {
struct subchannel_id schid;
spinlock_t lock; /* subchannel lock */
-
+ struct mutex reg_mutex;
enum {
SUBCHANNEL_TYPE_IO = 0,
SUBCHANNEL_TYPE_CHSC = 1,
enum {
SUBCHANNEL_TYPE_IO = 0,
SUBCHANNEL_TYPE_CHSC = 1,