Changeset 7329e6a in mainline for kernel/arch/arm32/src/mm/page_fault.c

Timestamp:

2010-11-29T19:22:58Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5581b469

Parents:

3a4b3ba (diff), 41a7f62 (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/arm32/src/mm/page_fault.c (modified) (2 diffs)

kernel/arch/arm32/src/mm/page_fault.c

@@ -141 +141 @@
         if (instr.condition == 0xf) {
                 panic("page_fault - instruction does not access memory "
-                    "(instr_code: %x, badvaddr:%x).", instr, badvaddr);
+                    "(instr_code: %#0" PRIx32 ", badvaddr:%p).",
+                    instr_union.pc, (void *) badvaddr);
                 return PF_ACCESS_EXEC;
         }
@@ -160 +161 @@
 
         panic("page_fault - instruction doesn't access memory "
-            "(instr_code: %x, badvaddr:%x).", instr, badvaddr);
+            "(instr_code: %#0" PRIx32 ", badvaddr:%p).",
+            instr_union.pc, (void *) badvaddr);
 
         return PF_ACCESS_EXEC;