Changeset 8b36bf2 in mainline for kernel/generic/src/udebug/udebug_ops.c

Timestamp:

2012-06-20T23:03:29Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

d5070ef

Parents:

8375d0eb (diff), 6eef3c4 (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/udebug/udebug_ops.c (modified) (3 diffs)

kernel/generic/src/udebug/udebug_ops.c

@@ -95 +95 @@
         
         /* Verify that 'thread' is a userspace thread. */
-        if ((thread->flags & THREAD_FLAG_USPACE) == 0) {
+        if (!thread->uspace) {
                 /* It's not, deny its existence */
                 irq_spinlock_unlock(&thread->lock, true);
@@ -200 +200 @@
                 
                 mutex_lock(&thread->udebug.lock);
-                if ((thread->flags & THREAD_FLAG_USPACE) != 0) {
+                if (thread->uspace) {
                         thread->udebug.active = true;
                         mutex_unlock(&thread->udebug.lock);
@@ -393 +393 @@
                 
                 irq_spinlock_lock(&thread->lock, false);
-                int flags = thread->flags;
+                bool uspace = thread->uspace;
                 irq_spinlock_unlock(&thread->lock, false);
                 
                 /* Not interested in kernel threads. */
-                if ((flags & THREAD_FLAG_USPACE) == 0)
+                if (!uspace)
                         continue;