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

Changeset 5863a95 in mainline for kernel/arch/ia64/src/ia64.c


Ignore:
Timestamp:
2010-12-17T08:59:35Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
58854f2
Parents:
70e5ad5 (diff), 11658b64 (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 development/ changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia64/src/ia64.c

    r70e5ad5 r5863a95  
    104104static void iosapic_init(void)
    105105{
    106         uint64_t IOSAPIC = PA2KA((unative_t)(iosapic_base)) | FW_OFFSET;
     106        uint64_t IOSAPIC = PA2KA((sysarg_t)(iosapic_base)) | FW_OFFSET;
    107107        int i;
    108108       
     
    251251 * We use r13 (a.k.a. tp) for this purpose.
    252252 */
    253 unative_t sys_tls_set(unative_t addr)
     253sysarg_t sys_tls_set(sysarg_t addr)
    254254{
    255255        return 0;
     
    274274void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
    275275{
    276         fptr->fnc = (unative_t) addr;
    277         fptr->gp = ((unative_t *) caller)[1];
     276        fptr->fnc = (sysarg_t) addr;
     277        fptr->gp = ((sysarg_t *) caller)[1];
    278278       
    279279        return (void *) fptr;
Note: See TracChangeset for help on using the changeset viewer.