Changeset 6843a9c in mainline for kernel/generic/src/udebug/udebug.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (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

Trivial conflicts.

File:

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

kernel/generic/src/udebug/udebug.c

@@ -410 +410 @@
                 
                 mutex_lock(&thread->udebug.lock);
-                unsigned int flags = thread->flags;
                 
                 /* Only process userspace threads. */
-                if ((flags & THREAD_FLAG_USPACE) != 0) {
+                if (thread->uspace) {
                         /* Prevent any further debug activity in thread. */
                         thread->udebug.active = false;