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

Timestamp:

2014-10-09T15:03:55Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e367939c

Parents:

21799398 (diff), 207e8880 (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 from lp:~adam-hraska+lp/helenos/rcu/.

Only merge from the feature branch and resolve all conflicts.

File:

• kernel/generic/src/debug/panic.c (modified) (1 diff)

kernel/generic/src/debug/panic.c

@@ -96 +96 @@
         printf("THE=%p: ", THE);
         if (THE != NULL) {
-                printf("pd=%" PRIun " thread=%p task=%p cpu=%p as=%p"
-                    " magic=%#" PRIx32 "\n", THE->preemption_disabled,
+                printf("pe=%" PRIun " thread=%p task=%p cpu=%p as=%p"
+                    " magic=%#" PRIx32 "\n", THE->preemption,
                     THE->thread, THE->task, THE->cpu, THE->as, THE->magic);