Changeset 6843a9c in mainline for kernel/generic/src/cpu/cpu.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

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

kernel/generic/src/cpu/cpu.c

@@ -74 +74 @@
                 for (i = 0; i < config.cpu_count; i++) {
                         cpus[i].stack = (uint8_t *) frame_alloc(STACK_FRAMES,
-                            FRAME_KA | FRAME_ATOMIC);
+                            FRAME_LOWMEM | FRAME_KA | FRAME_ATOMIC);
                         cpus[i].id = i;