Changeset e6a78b9 in mainline for kernel/generic/src/udebug

Timestamp:

2012-06-29T15:31:44Z (14 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.

Location:

kernel/generic/src/udebug

Files:

• udebug.c (modified) (1 diff)
• udebug_ops.c (modified) (3 diffs)

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;

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;