Changeset 04c418d in mainline for kernel/generic/src/proc

Timestamp:

2011-05-17T07:58:39Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

7d521e24

Parents:

e913cc9 (diff), 3375bd4 (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 development/ changes

Location:

kernel/generic/src/proc

Files:

• scheduler.c (modified) (1 diff)
• task.c (modified) (1 diff)
• thread.c (modified) (1 diff)

kernel/generic/src/proc/scheduler.c

@@ -354 +354 @@
         
         /*
-         * Through the 'THE' structure, we keep track of THREAD, TASK, CPU, VM
+         * Through the 'THE' structure, we keep track of THREAD, TASK, CPU, AS
          * and preemption counter. At this point THE could be coming either
          * from THREAD's or CPU's stack.

kernel/generic/src/proc/task.c

@@ -534 +534 @@
         */
         if (notify) {
-                if (event_is_subscribed(EVENT_FAULT)) {
-                        /* Notify the subscriber that a fault occurred. */
-                        event_notify_3(EVENT_FAULT, LOWER32(TASK->taskid),
-                            UPPER32(TASK->taskid), (sysarg_t) THREAD);
-                
+                /* Notify the subscriber that a fault occurred. */
+                if (event_notify_3(EVENT_FAULT, false, LOWER32(TASK->taskid),
+                    UPPER32(TASK->taskid), (sysarg_t) THREAD) == EOK) {
 #ifdef CONFIG_UDEBUG
                         /* Wait for a debugging session. */

kernel/generic/src/proc/thread.c

@@ -918 +918 @@
 }
 
+sysarg_t sys_thread_udelay(uint32_t usec)
+{
+        asm_delay_loop(usec * CPU->delay_loop_const);
+        return 0;
+}
+
 /** @}
  */