From owner-svn-src-head@freebsd.org  Thu Jun 22 14:30:10 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A5E6DD8D717;
 Thu, 22 Jun 2017 14:30:10 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 751627D03C;
 Thu, 22 Jun 2017 14:30:10 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5MEU9th063376;
 Thu, 22 Jun 2017 14:30:09 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5MEU9Zc063375;
 Thu, 22 Jun 2017 14:30:09 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201706221430.v5MEU9Zc063375@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 22 Jun 2017 14:30:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r320234 - head/sys/boot/efi/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2017 14:30:10 -0000

Author: emaste
Date: Thu Jun 22 14:30:09 2017
New Revision: 320234
URL: https://svnweb.freebsd.org/changeset/base/320234

Log:
  Make structure padding explicit in EFI_MEMORY_DESCRIPTOR
  
  The EFI memory descriptor 64-bit aligns PhysicalStart on both 32- and
  64-bit platforms.  Make the padding explicit for i386 EFI.
  
  Submitted by:	Siva Mahadevan <smahadevan@freebsdfoundation.org>
  MFC after:	3 weeks
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D11301

Modified:
  head/sys/boot/efi/include/efidef.h

Modified: head/sys/boot/efi/include/efidef.h
==============================================================================
--- head/sys/boot/efi/include/efidef.h	Thu Jun 22 13:31:44 2017	(r320233)
+++ head/sys/boot/efi/include/efidef.h	Thu Jun 22 14:30:09 2017	(r320234)
@@ -178,6 +178,7 @@ typedef enum {
 #define EFI_MEMORY_DESCRIPTOR_VERSION  1
 typedef struct {
     UINT32                          Type;           // Field size is 32 bits followed by 32 bit pad
+    UINT32                          Pad;
     EFI_PHYSICAL_ADDRESS            PhysicalStart;  // Field size is 64 bits
     EFI_VIRTUAL_ADDRESS             VirtualStart;   // Field size is 64 bits
     UINT64                          NumberOfPages;  // Field size is 64 bits