Changeset e6a78b9 in mainline for kernel/generic/src/synch/mutex.c

Timestamp:

2012-06-29T15:31:44Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c0 (diff), 0bbd13e (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/mutex.c (modified) (2 diffs)

kernel/generic/src/synch/mutex.c

@@ -63 +63 @@
 }
 
+#define MUTEX_DEADLOCK_THRESHOLD        100000000
+
 /** Acquire mutex.
  *
@@ -91 +93 @@
                 bool deadlock_reported = false;
                 do {
-                        if (cnt++ > DEADLOCK_THRESHOLD) {
+                        if (cnt++ > MUTEX_DEADLOCK_THRESHOLD) {
                                 printf("cpu%u: looping on active mutex %p\n",
                                     CPU->id, mtx);