Changeset df3c6f02 in mainline for kernel/generic/src/proc/scheduler.c

Timestamp:

2011-05-31T22:58:56Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d362410

Parents:

82582e4 (diff), 4ce90544 (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/proc/scheduler.c (modified) (2 diffs)

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.
@@ -376 +376 @@
         context_save(&CPU->saved_context);
         context_set(&CPU->saved_context, FADDR(scheduler_separated_stack),
-            (uintptr_t) CPU->stack, CPU_STACK_SIZE);
+            (uintptr_t) CPU->stack, STACK_SIZE);
         context_restore(&CPU->saved_context);