Changes in kernel/generic/src/syscall/syscall.c [2fa10f6:5e984f2] in mainline

File:

• kernel/generic/src/syscall/syscall.c (modified) (4 diffs)

kernel/generic/src/syscall/syscall.c

@@ -59 +59 @@
     unative_t a4, unative_t a5, unative_t a6, unative_t id)
 {
+        unative_t rc;
+        ipl_t ipl;
+
         /* Do userpace accounting */
-        irq_spinlock_lock(&THREAD->lock, true);
+        ipl = interrupts_disable();
+        spinlock_lock(&THREAD->lock);
         thread_update_accounting(true);
-        irq_spinlock_unlock(&THREAD->lock, true);
-        
+        spinlock_unlock(&THREAD->lock);
+        interrupts_restore(ipl);
+
 #ifdef CONFIG_UDEBUG
         /*
          * Early check for undebugged tasks. We do not lock anything as this
          * test need not be precise in either direction.
-         *
          */
-        if (THREAD->udebug.active)
+        if (THREAD->udebug.active) {
                 udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, 0, false);
+        }
 #endif
         
-        unative_t rc;
         if (id < SYSCALL_END) {
                 rc = syscall_table[id](a1, a2, a3, a4, a5, a6);
@@ -89 +93 @@
         if (THREAD->udebug.active) {
                 udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, rc, true);
-                
+        
                 /*
                  * Stopping point needed for tasks that only invoke
@@ -99 +103 @@
         }
 #endif
-        
+
         /* Do kernel accounting */
-        irq_spinlock_lock(&THREAD->lock, true);
+        ipl = interrupts_disable();
+        spinlock_lock(&THREAD->lock);
         thread_update_accounting(false);
-        irq_spinlock_unlock(&THREAD->lock, true);
+        spinlock_unlock(&THREAD->lock);
+        interrupts_restore(ipl);
         
         return rc;
@@ -159 +165 @@
         (syshandler_t) sys_physmem_map,
         (syshandler_t) sys_iospace_enable,
+        (syshandler_t) sys_preempt_control,
         
         /* Sysinfo syscalls */