svn commit: r287934 - head/sys/boot/efi/loader

[Adrian Chadd]

Hi,

Warner has been working on the modular kernel thing. But honestly, I
think we should just start biting that bullet and ship a modules-only
GENERIC by default..


-a


On 21 September 2015 at 11:02, Rui Paulo <rpaulo at me.com> wrote:
> So, we're going to keep ignoring the problem and keep patching things up?
> It's a bit sad that a single driver (pmspcv) is able to cause so much
> problems.
>
> --
> Rui Paulo
>
>
> On Sep 17, 2015, at 01:36 PM, John Baldwin <jhb at FreeBSD.org> wrote:
>
> 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)
>