Changeset 357b5f5 in mainline for kernel/arch/sparc64/src/mm/sun4u/tlb.c

Timestamp:

2011-01-23T20:09:13Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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:

• kernel/arch/sparc64/src/mm/sun4u/tlb.c (modified) (1 diff)

kernel/arch/sparc64/src/mm/sun4u/tlb.c

@@ -200 +200 @@
 
 /** ITLB miss handler. */
-void fast_instruction_access_mmu_miss(unative_t unused, istate_t *istate)
+void fast_instruction_access_mmu_miss(sysarg_t unused, istate_t *istate)
 {
         uintptr_t page_16k = ALIGN_DOWN(istate->tpc, PAGE_SIZE);