Fork us on GitHub Follow us on Facebook Follow us on Twitter

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


Ignore:
Timestamp:
2010-12-05T09:34:46Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
75732da
Parents:
56b962d (diff), 35537a7 (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:

Merge with development/

File:
1 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/ia64/src/main.c

    r56b962d r84439d7  
    6262       
    6363        printf(" %p|%p: boot info structure\n", &bootinfo, &bootinfo);
    64         printf(" %p|%p: kernel entry point\n", KERNEL_ADDRESS, KERNEL_ADDRESS);
    65         printf(" %p|%p: loader entry point\n", LOADER_ADDRESS, LOADER_ADDRESS);
     64        printf(" %p|%p: kernel entry point\n",
     65            (void *) KERNEL_ADDRESS, (void *) KERNEL_ADDRESS);
     66        printf(" %p|%p: loader entry point\n",
     67            (void *) LOADER_ADDRESS, (void *) LOADER_ADDRESS);
    6668       
    6769        size_t i;
    6870        for (i = 0; i < COMPONENTS; i++)
    69                 printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].start,
     71                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start,
    7072                    components[i].start, components[i].name,
    7173                    components[i].inflated, components[i].size);
Note: See TracChangeset for help on using the changeset viewer.