[PATCH 5/5] DO NOT APPLY: for verification purposes only

[Andrew Cooper <andrew.cooper3@citrix.com>]

---
 xen/arch/x86/cpu/mcheck/mce-apei.c |    5 +++--
 xen/arch/x86/hvm/vmx/vmcs.c        |    5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/xen/arch/x86/cpu/mcheck/mce-apei.c b/xen/arch/x86/cpu/mcheck/mce-apei.c
index 3bf760a..6182d6b 100644
--- a/xen/arch/x86/cpu/mcheck/mce-apei.c
+++ b/xen/arch/x86/cpu/mcheck/mce-apei.c
@@ -49,11 +49,12 @@
  * CPER specification (in UEFI specification 2.3 appendix N) requires
  * byte-packed.
  */
-struct __packed cper_mce_record {
+#undef __packed
+struct cper_mce_record {
 	struct cper_record_header hdr;
 	struct cper_section_descriptor sec_hdr;
 	struct mce mce;
-};
+} __packed;
 /* Reset to default packing */
 #pragma pack()
 
diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c
index 4b886e5..9ffb4af 100644
--- a/xen/arch/x86/hvm/vmx/vmcs.c
+++ b/xen/arch/x86/hvm/vmx/vmcs.c
@@ -670,6 +670,11 @@ void vmx_vmcs_exit(struct vcpu *v)
     }
 }
 
+struct xgt_desc {
+    unsigned short size;
+    unsigned long address __attribute__((packed));
+};
+
 static void vmx_set_host_env(struct vcpu *v)
 {
     unsigned int cpu = smp_processor_id();
-- 
1.7.10.4