Changeset eb522e8 in mainline for boot/arch/ia64/src/main.c

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Huuuuuge merge from development - all the work actually

File:

• boot/arch/ia64/src/main.c (modified) (1 diff)

boot/arch/ia64/src/main.c

@@ -62 +62 @@
         
         printf(" %p|%p: boot info structure\n", &bootinfo, &bootinfo);
-        printf(" %p|%p: kernel entry point\n", KERNEL_ADDRESS, KERNEL_ADDRESS);
-        printf(" %p|%p: loader entry point\n", LOADER_ADDRESS, LOADER_ADDRESS);
+        printf(" %p|%p: kernel entry point\n",
+            (void *) KERNEL_ADDRESS, (void *) KERNEL_ADDRESS);
+        printf(" %p|%p: loader entry point\n",
+            (void *) LOADER_ADDRESS, (void *) LOADER_ADDRESS);
         
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
-                printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].start,
+                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start,
                     components[i].start, components[i].name,
                     components[i].inflated, components[i].size);