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

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• kernel/generic/src/proc/scheduler.c (modified) (2 diffs)

kernel/generic/src/proc/scheduler.c

@@ -92 +92 @@
         else
                 fpu_disable();
-#else
+#elif defined CONFIG_FPU
         fpu_enable();
         if (THREAD->fpu_context_exists)
@@ -327 +327 @@
                 THREAD->kcycles += get_cycle() - THREAD->last_cycle;
                 
-#ifndef CONFIG_FPU_LAZY
+#if (defined CONFIG_FPU) && (!defined CONFIG_FPU_LAZY)
                 fpu_context_save(THREAD->saved_fpu_context);
 #endif