diff options
| author |   Heiko Carstens <heiko.carstens@de.ibm.com> | 2017-08-07 15:16:16 +0200 |
|---|---|---|
| committer |   Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-08-09 09:09:36 -0400 |
| commit | ef267938f07197fc011e3aada67ac70a3c65c2ff (patch) | |
| tree | 79b455ea3afe7f24586907a371e5ff95efc8d478 | |
| parent | s390/vmcp: make use of contiguous memory allocator (diff) | |
| download | wireguard-linux-ef267938f07197fc011e3aada67ac70a3c65c2ff.tar.xz wireguard-linux-ef267938f07197fc011e3aada67ac70a3c65c2ff.zip | |
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>
| -rw-r--r-- | arch/s390/include/uapi/asm/vmcp.h (renamed from drivers/s390/char/vmcp.h) | 21 | ||||
| -rw-r--r-- | drivers/s390/char/vmcp.c | 11 |
2 files changed, 17 insertions, 15 deletions
diff --git a/drivers/s390/char/vmcp.h b/arch/s390/include/uapi/asm/vmcp.h index 4e725edf449f..4caf71714a55 100644 --- 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 c202b407698f..18b30119a70e 100644 --- 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; |