Merge tag 'upstream/3.14'

[debian/elilo] / ia32 / bzimage.c

diff --git a/ia32/bzimage.c b/ia32/bzimage.c
index 0dd07722fb33701042e5264b08d8e7e0032fe7f1..bb00632f1c260d359f48eac4794c3b6b4e1ee6e0 100644 (file)
--- a/ia32/bzimage.c
+++ b/ia32/bzimage.c
@@ -34,7 +34,7 @@
 boot_params_t *param_start = NULL;
 UINTN param_size = 0;
 
-UINTN kernel_size = 0x200000;  /* 2M (largest x86 bzImage kernel image) */
+UINTN kernel_size = 0x400000;  /* 4M (default x86 bzImage size limit) */
 
 static INTN
 bzImage_probe(CHAR16 *kname)
@@ -169,7 +169,7 @@ bzImage_probe(CHAR16 *kname)
                         kernel_start));
         }
 
-        kernel_load_address = kernel_start;
+        kernel_load_address = NULL; /* allocate anywhere! */
 
         if (alloc_kmem(kernel_start, EFI_SIZE_TO_PAGES(kernel_size)) != 0) {
                 /*