Ignore:
Timestamp:
2010-12-25T21:20:28Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
631ee0c
Parents:
1bfd3d3 (diff), 09178b7f (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 mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/sparc64/include/mm/sun4v/tlb.h

    r1bfd3d3 r973ef9fc  
    141141}
    142142
    143 extern void fast_instruction_access_mmu_miss(unative_t, istate_t *);
    144 extern void fast_data_access_mmu_miss(unative_t, istate_t *);
    145 extern void fast_data_access_protection(unative_t, istate_t *);
     143extern void fast_instruction_access_mmu_miss(sysarg_t, istate_t *);
     144extern void fast_data_access_mmu_miss(sysarg_t, istate_t *);
     145extern void fast_data_access_protection(sysarg_t, istate_t *);
    146146
    147147extern void dtlb_insert_mapping(uintptr_t, uintptr_t, int, bool, bool);
Note: See TracChangeset for help on using the changeset viewer.