Changeset 7bdcc45 in mainline for kernel/generic/src/synch/spinlock.c

Timestamp:

2010-12-16T16:38:49Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/generic/src/synch/spinlock.c (modified) (1 diff)

kernel/generic/src/synch/spinlock.c

@@ -102 +102 @@
                 
                 if (i++ > DEADLOCK_THRESHOLD) {
-                        printf("cpu%u: looping on spinlock %" PRIp ":%s, "
-                            "caller=%" PRIp "(%s)\n", CPU->id, lock, lock->name,
-                            CALLER, symtab_fmt_name_lookup(CALLER));
+                        printf("cpu%u: looping on spinlock %p:%s, "
+                            "caller=%p (%s)\n", CPU->id, lock, lock->name,
+                            (void *) CALLER, symtab_fmt_name_lookup(CALLER));
                         
                         i = 0;