restore patches lost when merging NMU diff

[debian/elilo] / initrd.c

diff --git a/initrd.c b/initrd.c
index 09ed0f0eb8d2930fe552e8edf1935cc9f717b7be..581abda225eeb66b2fb382892e26dfe402f84127 100644 (file)
--- a/initrd.c
+++ b/initrd.c
@@ -41,7 +41,7 @@ INTN
 load_file(CHAR16 *filename, memdesc_t *image)
 {
        EFI_STATUS status;
-       VOID *start_addr = image->start_addr;
+       VOID *start_addr = NULL;
        UINTN pgcnt;
        UINT64 size = 0;
        fops_fd_t fd;
@@ -71,15 +71,15 @@ load_file(CHAR16 *filename, memdesc_t *image)
        /* round up to get required number of pages (4KB) */
        image->pgcnt = pgcnt = EFI_SIZE_TO_PAGES(image->size);
 
-       start_addr = alloc_pages(pgcnt, EfiLoaderData, start_addr ? AllocateAddress : AllocateAnyPages, start_addr);
+       start_addr = alloc_pages(pgcnt, EfiLoaderData, start_addr ? AllocateAddress : AllocateAnyPages, 0 );
        if (start_addr == NULL) {
                ERR_PRT((L"Failed to allocate %d pages for %s image", pgcnt,
                         filename));
                goto error;
        }
-       VERB_PRT(2, Print(L"%s image: total_size: %ld bytes base: 0x%lx "
+       VERB_PRT(2, Print(L"%s image: total_size: %d bytes base: " PTR_FMT " "
                          "pages %d\n", filename, image->size,
-                         (UINTN)start_addr, pgcnt));
+                         start_addr, pgcnt));
 
        Print(L"Loading file %s...", filename);