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

Timestamp:

2011-01-09T12:18:00Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

54de5ebd

Parents:

a3eeef45 (diff), 9d12059 (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.

File:

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

kernel/generic/src/syscall/syscall.c

@@ -45 +45 @@
 #include <debug.h>
 #include <ddi/device.h>
+#include <interrupt.h>
 #include <ipc/sysipc.h>
 #include <synch/futex.h>
@@ -66 +67 @@
 #ifdef CONFIG_UDEBUG
         /*
+         * An istate_t-compatible record was created on the stack by the
+         * low-level syscall handler. This is the userspace space state
+         * structure.
+         */
+        THREAD->udebug.uspace_state = istate_get(THREAD);
+
+        /*
          * Early check for undebugged tasks. We do not lock anything as this
          * test need not be precise in either direction.
-         *
          */
         if (THREAD->udebug.active)
@@ -98 +105 @@
                 udebug_stoppable_end();
         }
+
+        /* Clear userspace state pointer */
+        THREAD->udebug.uspace_state = NULL;
 #endif
         
@@ -120 +130 @@
         (syshandler_t) sys_task_get_id,
         (syshandler_t) sys_task_set_name,
+        (syshandler_t) sys_task_kill,
         (syshandler_t) sys_program_spawn_loader,