From owner-svn-src-all@freebsd.org  Thu Sep 17 20:36:47 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 7C0EF9CEF12;
 Thu, 17 Sep 2015 20:36:47 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 6CEF11354;
 Thu, 17 Sep 2015 20:36:47 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8HKalNC088026;
 Thu, 17 Sep 2015 20:36:47 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8HKalKU088025;
 Thu, 17 Sep 2015 20:36:47 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201509172036.t8HKalKU088025@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 17 Sep 2015 20:36:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287934 - head/sys/boot/efi/loader
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Sep 2015 20:36:47 -0000

Author: jhb
Date: Thu Sep 17 20:36:46 2015
New Revision: 287934
URL: https://svnweb.freebsd.org/changeset/base/287934

Log:
  The EFI boot loader allocates a single chunk of contiguous memory to
  hold the kernel, modules, and any other loaded data.  This memory block
  is relocated to the kernel's expected location during the transfer of
  control from the loader to the kernel.
  
  The GENERIC kernel on amd64 has recently grown such that a kernel + zfs.ko
  no longer fits in the default staging size.  Bump the default size from
  32MB to 48MB to provide more breathing room.
  
  PR:		201679
  Reviewed by:	imp
  MFC after:	1 week
  Differential Revision:	https://reviews.freebsd.org/D3666

Modified:
  head/sys/boot/efi/loader/copy.c

Modified: head/sys/boot/efi/loader/copy.c
==============================================================================
--- head/sys/boot/efi/loader/copy.c	Thu Sep 17 20:36:34 2015	(r287933)
+++ head/sys/boot/efi/loader/copy.c	Thu Sep 17 20:36:46 2015	(r287934)
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <efilib.h>
 
 #ifndef EFI_STAGING_SIZE
-#define	EFI_STAGING_SIZE	32
+#define	EFI_STAGING_SIZE	48
 #endif
 
 #define	STAGE_PAGES	((EFI_STAGING_SIZE) * 1024 * 1024 / 4096)