projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
s390
/
char
/
vmcp.h
diff --git
a/drivers/s390/char/vmcp.h
b/drivers/s390/char/vmcp.h
index
87389e7
..
6a99394
100644
(file)
--- a/
drivers/s390/char/vmcp.h
+++ b/
drivers/s390/char/vmcp.h
@@
-1,6
+1,6
@@
/*
* Copyright (C) 2004, 2005 IBM Corporation
/*
* Copyright (C) 2004, 2005 IBM Corporation
- * Interface implementation for communication with the
v
/VM control program
+ * Interface implementation for communication with the
z
/VM control program
* Version 1.0
* Author(s): Christian Borntraeger <cborntra@de.ibm.com>
*
* Version 1.0
* Author(s): Christian Borntraeger <cborntra@de.ibm.com>
*
@@
-12,8
+12,8
@@
* The idea of this driver is based on cpint from Neale Ferguson
*/
* The idea of this driver is based on cpint from Neale Ferguson
*/
-#include <asm/semaphore.h>
#include <linux/ioctl.h>
#include <linux/ioctl.h>
+#include <linux/mutex.h>
#define VMCP_GETCODE _IOR(0x10, 1, int)
#define VMCP_SETBUF _IOW(0x10, 2, int)
#define VMCP_GETCODE _IOR(0x10, 1, int)
#define VMCP_SETBUF _IOW(0x10, 2, int)
@@
-26,5
+26,5
@@
struct vmcp_session {
int resp_code;
/* As we use copy_from/to_user, which might *
* sleep and cannot use a spinlock */
int resp_code;
/* As we use copy_from/to_user, which might *
* sleep and cannot use a spinlock */
- struct
semaphore
mutex;
+ struct
mutex
mutex;
};
};