Ignore:
Timestamp:
2011-02-09T11:46:47Z (14 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cb15135a
Parents:
a49c4002 (diff), 0b37882 (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

Local modifications:

  • change pipefs and ext2 to build again (use async_* calls instead of ipc_*)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/sparc64/src/mm/sun4v/tlb.c

    ra49c4002 rcf2af94  
    213213
    214214/** ITLB miss handler. */
    215 void fast_instruction_access_mmu_miss(unative_t unused, istate_t *istate)
     215void fast_instruction_access_mmu_miss(sysarg_t unused, istate_t *istate)
    216216{
    217217        uintptr_t va = ALIGN_DOWN(istate->tpc, PAGE_SIZE);
Note: See TracChangeset for help on using the changeset viewer.