Changes in boot/arch/ia64/src/main.c [dbb3552:4646710] in mainline

File:

• boot/arch/ia64/src/main.c (modified) (5 diffs)

boot/arch/ia64/src/main.c

@@ -33 +33 @@
 #include <arch/arch.h>
 #include <arch/asm.h>
-#include <arch/_components.h>
 #include <genarch/efi.h>
 #include <arch/sal.h>
@@ -46 +45 @@
 #include <errno.h>
 #include <inflate.h>
+#include "../../components.h"
 
 #define DEFAULT_MEMORY_BASE             0x4000000ULL
@@ -78 +78 @@
                 memmap[items].size = DEFAULT_LEGACY_IO_SIZE;
                 memmap[items].type = MEMMAP_IO_PORTS;
-                items++;                 
+                items++;
         } else {
                 char *cur, *mm_base = (char *) bootpar->efi_memmap;
@@ -159 +159 @@
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
-                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start,
-                    components[i].start, components[i].name,
+                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].addr,
+                    components[i].addr, components[i].name,
                     components[i].inflated, components[i].size);
         
@@ -202 +202 @@
                  * overlap with the destination for inflate().
                  */
-                memmove((void *) top, components[i - 1].start, components[i - 1].size);
+                memmove((void *) top, components[i - 1].addr, components[i - 1].size);
                 
                 int err = inflate((void *) top, components[i - 1].size,