diff options
| author | David Kershner <david.kershner@unisys.com> | 2015-06-12 16:46:06 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-12 17:08:07 -0700 |
| commit | c20a99f8c38f41ce875bfea829ca0dd603f1d11b (patch) | |
| tree | 9461296bc960e5c4ac54e48e1a42783b0ec9b3a6 | |
| parent | df7f46e83c7f52ee6e7cf96eb8c068b1d1f8c68f (diff) | |
| download | linux-c20a99f8c38f41ce875bfea829ca0dd603f1d11b.tar.gz | |
staging: unisys: Move phys_info to iochannel.h
This moves phys_info to iochannel.h. It is only used by iochannel.h and is not needed in vmcallinterfaces.h. Signed-off-by: David Kershner <david.kershner@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/unisys/include/iochannel.h | 6 | ||||
| -rw-r--r-- | drivers/staging/unisys/visorbus/vmcallinterface.h | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/drivers/staging/unisys/include/iochannel.h b/drivers/staging/unisys/include/iochannel.h index cbb58757e76a..ee28cdc1c703 100644 --- a/drivers/staging/unisys/include/iochannel.h +++ b/drivers/staging/unisys/include/iochannel.h @@ -149,6 +149,12 @@ enum vdisk_mgmt_types { /* structs with pragma pack */ +struct phys_info { + u64 pi_pfn; + u16 pi_off; + u16 pi_len; +} __packed; + /* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */ /* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */ diff --git a/drivers/staging/unisys/visorbus/vmcallinterface.h b/drivers/staging/unisys/visorbus/vmcallinterface.h index dc09caf7d075..7a53df00726a 100644 --- a/drivers/staging/unisys/visorbus/vmcallinterface.h +++ b/drivers/staging/unisys/visorbus/vmcallinterface.h @@ -94,18 +94,6 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL identification tuples */ /* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */ /* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */ #pragma pack(push, 1) -struct phys_info { - u64 pi_pfn; - u16 pi_off; - u16 pi_len; -}; - -#pragma pack(pop) -/* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */ - -/* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */ -/* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */ -#pragma pack(push, 1) /* Parameters to VMCALL_IO_CONTROLVM_ADDR interface */ struct vmcall_io_controlvm_addr_params { /* The Guest-relative physical address of the ControlVm channel. |