Changeset 387416b in mainline for kernel/generic/src/syscall/syscall.c

Timestamp:

2009-12-12T10:11:35Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

99de22b

Parents:

58d5803d (diff), 1e4cada (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:

Synchronizing with head.

File:

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

kernel/generic/src/syscall/syscall.c

@@ -62 +62 @@
 
 #ifdef CONFIG_UDEBUG
-        bool debug;
-
         /*
          * Early check for undebugged tasks. We do not lock anything as this
-         * test need not be precise in either way.
+         * test need not be precise in either direction.
          */
-        debug = THREAD->udebug.active;
-        
-        if (debug) {
+        if (THREAD->udebug.active) {
                 udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, 0, false);
         }
@@ -87 +83 @@
         
 #ifdef CONFIG_UDEBUG
-        if (debug) {
+        if (THREAD->udebug.active) {
                 udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, rc, true);
         
@@ -111 +107 @@
         (syshandler_t) sys_thread_exit,
         (syshandler_t) sys_thread_get_id,
+        (syshandler_t) sys_thread_usleep,
         
         (syshandler_t) sys_task_get_id,
@@ -117 +114 @@
         
         /* Synchronization related syscalls. */
-        (syshandler_t) sys_futex_sleep_timeout,
+        (syshandler_t) sys_futex_sleep,
         (syshandler_t) sys_futex_wakeup,
         (syshandler_t) sys_smc_coherence,