s390/vmcp: split vmcp header file and move to uapi

Split the vmcp header file and move the device driver internal
structure to the C file, and move the ioctl definitions to the uapi
directory.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/drivers/s390/char/vmcp.h b/arch/s390/include/uapi/asm/vmcp.h
similarity index 54%
rename from drivers/s390/char/vmcp.h
rename to arch/s390/include/uapi/asm/vmcp.h
index 4e725ed..4caf717 100644 (file)
--- a/drivers/s390/char/vmcp.h
+++ b/arch/s390/include/uapi/asm/vmcp.h
@@ -12,20 +12,13 @@
  * The idea of this driver is based on cpint from Neale Ferguson
  */
 
+#ifndef _UAPI_ASM_VMCP_H
+#define _UAPI_ASM_VMCP_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_GETSIZE _IOR(0x10, 3, int)
+#define VMCP_GETCODE   _IOR(0x10, 1, int)
+#define VMCP_SETBUF    _IOW(0x10, 2, int)
+#define VMCP_GETSIZE   _IOR(0x10, 3, int)
 
-struct vmcp_session {
-       char *response;
-       unsigned int bufsize;
-       unsigned int cma_alloc : 1;
-       int resp_size;
-       int resp_code;
-       /* As we use copy_from/to_user, which might     *
-        * sleep and cannot use a spinlock              */
-       struct mutex mutex;
-};
+#endif /* _UAPI_ASM_VMCP_H */

diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
index c202b40..18b3011 100644 (file)
--- a/drivers/s390/char/vmcp.c
+++ b/drivers/s390/char/vmcp.c
@@ -25,7 +25,16 @@
 #include <asm/compat.h>
 #include <asm/cpcmd.h>
 #include <asm/debug.h>
-#include "vmcp.h"
+#include <asm/vmcp.h>
+
+struct vmcp_session {
+       char *response;
+       unsigned int bufsize;
+       unsigned int cma_alloc : 1;
+       int resp_size;
+       int resp_code;
+       struct mutex mutex;
+};
 
 static debug_info_t *vmcp_debug;