Changeset e2fcdb1 in mainline for kernel/generic/src/interrupt

Timestamp:

2010-05-09T18:36:12Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c6f0e3a2

Parents:

4039c77 (diff), cd98e594 (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 fix for ticket #232.

File:

• kernel/generic/src/interrupt/interrupt.c (modified) (2 diffs)

kernel/generic/src/interrupt/interrupt.c

@@ -93 +93 @@
 
         /* Account user cycles */
-        if (THREAD)
+        if (THREAD) {
+                spinlock_lock(&THREAD->lock);
                 thread_update_accounting(true);
+                spinlock_unlock(&THREAD->lock);
+        }
 
 #ifdef CONFIG_UDEBUG
@@ -110 +113 @@
                 thread_exit();
 
-        if (THREAD)
+        if (THREAD) {
+                spinlock_lock(&THREAD->lock);
                 thread_update_accounting(false);
+                spinlock_unlock(&THREAD->lock);
+        }
 }