Changeset e2fcdb1 in mainline for kernel/generic/src/syscall/syscall.c

Timestamp:

2010-05-09T18:36:12Z (14 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/syscall/syscall.c (modified) (2 diffs)

kernel/generic/src/syscall/syscall.c

@@ -60 +60 @@
 {
         unative_t rc;
+        ipl_t ipl;
 
         /* Do userpace accounting */
+        ipl = interrupts_disable();
+        spinlock_lock(&THREAD->lock);
         thread_update_accounting(true);
+        spinlock_unlock(&THREAD->lock);
+        interrupts_restore(ipl);
 
 #ifdef CONFIG_UDEBUG
@@ -100 +105 @@
 
         /* Do kernel accounting */
+        (void) interrupts_disable();
+        spinlock_lock(&THREAD->lock);
         thread_update_accounting(false);
+        spinlock_unlock(&THREAD->lock);
+        interrupts_restore(ipl);
         
         return rc;