Ignore:
Timestamp:
2010-12-16T16:38:49Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7837101
Parents:
8e58f94 (diff), eb221e5 (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/sun4u/tlb.h

    r8e58f94 r7bdcc45  
    678678}
    679679
    680 extern void fast_instruction_access_mmu_miss(unative_t, istate_t *);
     680extern void fast_instruction_access_mmu_miss(sysarg_t, istate_t *);
    681681extern void fast_data_access_mmu_miss(tlb_tag_access_reg_t, istate_t *);
    682682extern void fast_data_access_protection(tlb_tag_access_reg_t , istate_t *);
Note: See TracChangeset for help on using the changeset viewer.