From ff5fb3083b03478b1e794bff3c8ed9ce85c58788 Mon Sep 17 00:00:00 2001
From: Toomas Soome <tsoome@me.com>
Date: Sun, 18 Feb 2018 09:35:16 +0200
Subject: [PATCH] loader.efi: Do not pad the efi devpath structure

illumos issue #9126
---
 usr/src/boot/sys/boot/efi/include/efidevp.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/src/boot/sys/boot/efi/include/efidevp.h b/usr/src/boot/sys/boot/efi/include/efidevp.h
index 8adfbf490e..51ebd624e4 100644
--- a/usr/src/boot/sys/boot/efi/include/efidevp.h
+++ b/usr/src/boot/sys/boot/efi/include/efidevp.h
@@ -30,6 +30,8 @@ Revision History
 // Device Path structures - Section C
 //
 
+#pragma pack(1)
+
 typedef struct _EFI_DEVICE_PATH {
         UINT8                           Type;
         UINT8                           SubType;
@@ -456,4 +458,6 @@ typedef struct _EFI_DEVICE_PATH_TO_TEXT_PROTOCOL {
 	EFI_DEVICE_PATH_TO_TEXT_PATH ConvertDevicePathToText;
 } EFI_DEVICE_PATH_TO_TEXT_PROTOCOL;
 
+#pragma pack()
+
 #endif
-- 
2.11.4.GIT