Changeset cefb126 in mainline for kernel/arch/ppc32/src/mm/tlb.c

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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/ppc32/src/mm/tlb.c (modified) (4 diffs)

kernel/arch/ppc32/src/mm/tlb.c

@@ -111 +111 @@
 static void pht_refill_fail(uintptr_t badvaddr, istate_t *istate)
 {
-        const char *symbol = symtab_fmt_name_lookup(istate->pc);
-        const char *sym2 = symtab_fmt_name_lookup(istate->lr);
-        
-        fault_if_from_uspace(istate,
-            "PHT Refill Exception on %p.", badvaddr);
-        panic("%p: PHT Refill Exception at %p (%s<-%s).", badvaddr,
-            istate->pc, symbol, sym2);
+        fault_if_from_uspace(istate, "PHT Refill Exception on %p.", badvaddr);
+        panic_memtrap(istate, PF_ACCESS_READ, badvaddr,
+            "PHT Refill Exception.");
 }
 
@@ -209 +205 @@
  *
  */
-void pht_refill(int n, istate_t *istate)
+void pht_refill(unsigned int n, istate_t *istate)
 {
         as_t *as = (AS == NULL) ? AS_KERNEL : AS;
@@ -260 +256 @@
  *
  */
-bool pht_refill_real(int n, istate_t *istate)
+bool pht_refill_real(unsigned int n, istate_t *istate)
 {
         uintptr_t badvaddr;
@@ -366 +362 @@
  *
  */
-void tlb_refill_real(int n, uint32_t tlbmiss, ptehi_t ptehi, ptelo_t ptelo, istate_t *istate)
+void tlb_refill_real(unsigned int n, uint32_t tlbmiss, ptehi_t ptehi,
+    ptelo_t ptelo, istate_t *istate)
 {
         uint32_t badvaddr = tlbmiss & 0xfffffffc;