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

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• kernel/generic/src/proc/scheduler.c (modified) (1 diff)

kernel/generic/src/proc/scheduler.c

@@ -163 +163 @@
                         irq_spinlock_unlock(&CPU->lock, false);
                         THREAD->saved_fpu_context =
-                            (fpu_context_t *) slab_alloc(fpu_context_slab, 0);
+                            (fpu_context_t *) slab_alloc(fpu_context_cache, 0);
                         
                         /* We may have switched CPUs during slab_alloc */