From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: David Kershner Subject: [PATCH v2 1/3] staging: unisys: Move phys_info to iochannel.h Date: Fri, 12 Jun 2015 16:46:06 -0400 Message-ID: <1434141968-4133-2-git-send-email-david.kershner@unisys.com> In-Reply-To: <1434141968-4133-1-git-send-email-david.kershner@unisys.com> References: <1434141968-4133-1-git-send-email-david.kershner@unisys.com> MIME-Version: 1.0 Content-Type: text/plain List-ID: To: gregkh@linuxfoundation.org Cc: Jes.Sorensen@redhat.com, driverdev-devel@linuxdriverproject.org, sParMaintainer@unisys.com, Benjamin.Romer@unisys.com, David Kershner 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 --- drivers/staging/unisys/include/iochannel.h | 6 ++++++ 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 cbb5875..ee28cdc 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 dc09caf..7a53df0 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. -- 1.9.1