Changeset 810a36f in mainline for kernel/generic/src/debug/panic.c

Timestamp:

2017-10-24T05:29:08Z (6 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

b1eb7ef

Parents:

c8fbbe7 (diff), 673ea28 (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 branch 'types'.

File:

• kernel/generic/src/debug/panic.c (modified) (2 diffs)

kernel/generic/src/debug/panic.c

@@ -62 +62 @@
                 printf("\n");
         } else if (cat == PANIC_BADTRAP) {
-                printf("bad trap %" PRIun ". %s\n", address,
+                printf("bad trap %" PRIuPTR ". %s\n", address,
                     BANNER_RIGHT);
                 if (fmt) {
@@ -96 +96 @@
         printf("THE=%p: ", THE);
         if (THE != NULL) {
-                printf("pe=%" PRIun " thread=%p task=%p cpu=%p as=%p"
+                printf("pe=%" PRIuPTR " thread=%p task=%p cpu=%p as=%p"
                     " magic=%#" PRIx32 "\n", THE->preemption,
                     THE->thread, THE->task, THE->cpu, THE->as, THE->magic);