Changeset 06b0211b in mainline for kernel/arch/sparc64/src/mm/sun4u/tlb.c

Timestamp:

2013-04-29T11:29:45Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

aa2b32c

Parents:

ba4799a (diff), df956b9b (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) (2 diffs)

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

@@ -196 +196 @@
 void fast_instruction_access_mmu_miss(sysarg_t unused, istate_t *istate)
 {
-        uintptr_t page_16k = ALIGN_DOWN(istate->tpc, PAGE_SIZE);
         size_t index = (istate->tpc >> MMU_PAGE_WIDTH) % MMU_PAGES_PER_PAGE;
         pte_t *t;
 
-        t = page_mapping_find(AS, page_16k, true);
+        t = page_mapping_find(AS, istate->tpc, true);
         if (t && PTE_EXECUTABLE(t)) {
                 /*
@@ -216 +215 @@
                  * handler.
                  */
-                as_page_fault(page_16k, PF_ACCESS_EXEC, istate);
+                as_page_fault(istate->tpc, PF_ACCESS_EXEC, istate);
         }
 }