diff -Napur -X /home/jbarnes/dontdiff elilo-3.4.orig/alloc.c elilo-3.4/alloc.c --- elilo-3.4.orig/alloc.c 2003-08-19 09:42:00.000000000 -0700 +++ elilo-3.4/alloc.c 2004-08-24 10:41:14.000000000 -0700 @@ -129,7 +129,9 @@ alloc_pages(UINTN pgcnt, EFI_MEMORY_TYPE status = BS->AllocatePages(where, type , pgcnt, &tmp); if (EFI_ERROR(status)) { - ERR_PRT((L"allocator: AllocatePages(%d, %d, %d, 0x%lx) failed (%r)\n", where, type, pgcnt, tmp, status)); + /* VERB_PRT because there might not be memory at the + * default load address */ + VERB_PRT(1, (L"allocator: AllocatePages(%d, %d, %d, 0x%lx) failed (%r)\n", where, type, pgcnt, tmp, status)); return NULL; } /* XXX: will cause warning on IA-32 */ @@ -155,7 +157,7 @@ free(VOID *addr) if (p->addr == addr) goto found; } /* not found */ - ERR_PRT((L"allocator: invalid free @ 0x%lx\n", addr)); + VERB_PRT(1, (L"allocator: invalid free @ 0x%lx\n", addr)); return; found: DBG_PRT((L"free: %s @0x%lx size=%ld\n", diff -Napur -X /home/jbarnes/dontdiff elilo-3.4.orig/ia64/gzip.c elilo-3.4/ia64/gzip.c --- elilo-3.4.orig/ia64/gzip.c 2003-08-19 09:46:28.000000000 -0700 +++ elilo-3.4/ia64/gzip.c 2004-08-24 10:41:14.000000000 -0700 @@ -433,7 +433,9 @@ first_block (const char *buf, long block if (alloc_kmem((void *)low_addr, pages) == -1) { VOID *new_addr; - ERR_PRT((L"%s : AllocatePages(%d, 0x%lx) for kernel failed\n", LD_NAME, pages, low_addr)); + /* VERB_PRT since there might not be memory at the + * default load address */ + VERB_PRT(1, (L"%s : AllocatePages(%d, 0x%lx) for kernel failed\n", LD_NAME, pages, low_addr)); if (ia64_can_relocate() == 0) { ERR_PRT((L"relocation is disabled, cannot load kernel")); @@ -458,7 +460,7 @@ first_block (const char *buf, long block /* unsigned arithmetic */ load_offset = (UINTN) (new_addr - ROUNDDOWN((UINTN) low_addr,256*MB)); - ERR_PRT((L"low_addr=0x%lx new_addr=0x%lx offset=0x%lx", low_addr, new_addr, load_offset)); + VERB_PRT(1, (L"low_addr=0x%lx new_addr=0x%lx offset=0x%lx", low_addr, new_addr, load_offset)); /* * correct various addresses for non-zero load_offset diff -Napur -X /home/jbarnes/dontdiff elilo-3.4.orig/ia64/plain_loader.c elilo-3.4/ia64/plain_loader.c --- elilo-3.4.orig/ia64/plain_loader.c 2003-08-19 09:46:45.000000000 -0700 +++ elilo-3.4/ia64/plain_loader.c 2004-08-24 10:41:51.000000000 -0700 @@ -170,8 +170,6 @@ load_elf(fops_fd_t fd, kdesc_t *kd) UINTN paddr, memsz, filesz, poffs; UINT16 phnum; - Print(L"Loading Linux... "); - size = sizeof(ehdr); status = fops_read(fd, &ehdr, &size); @@ -288,7 +286,7 @@ load_elf(fops_fd_t fd, kdesc_t *kd) if (alloc_kmem(low_addr, pages) == -1) { VOID *new_addr; - ERR_PRT((L"%s : AllocatePages(%d, 0x%lx) for kernel failed\n", LD_NAME, pages, low_addr)); + VERB_PRT(1, (L"%s : AllocatePages(%d, 0x%lx) for kernel failed\n", LD_NAME, pages, low_addr)); if (ia64_can_relocate() == 0) { ERR_PRT((L"relocation is disabled, cannot load kernel")); @@ -304,7 +302,7 @@ load_elf(fops_fd_t fd, kdesc_t *kd) * that alignment constraints will be satisified, regardless * of the kernel used. */ - Print(L"Attempting to relocate kernel.\n"); + VERB_PRT(1, (L"Attempting to relocate kernel.\n")); if (find_kernel_memory(low_addr, max_addr, 256*MB, &new_addr) == -1) { ERR_PRT((L"%s : find_kernel_memory(0x%lx, 0x%lx, 0x%lx, 0x%lx) failed\n", LD_NAME, low_addr, max_addr, 256*MB, &load_offset)); goto out;