Changeset 3f03199 in mainline for kernel/generic/src/cpu/cpu.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

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

kernel/generic/src/cpu/cpu.c

@@ -73 +73 @@
                 size_t i;
                 for (i = 0; i < config.cpu_count; i++) {
-                        cpus[i].stack = (uint8_t *) frame_alloc(STACK_FRAMES,
-                            FRAME_LOWMEM | FRAME_KA | FRAME_ATOMIC);
+                        uintptr_t stack_phys = frame_alloc(STACK_FRAMES,
+                            FRAME_LOWMEM | FRAME_ATOMIC, STACK_SIZE - 1);
+                        if (!stack_phys)
+                                panic("Cannot allocate CPU stack.");
+                        
+                        cpus[i].stack = (uint8_t *) PA2KA(stack_phys);
                         cpus[i].id = i;
                         
                         irq_spinlock_initialize(&cpus[i].lock, "cpus[].lock");
                         
-                        unsigned int j;
-                        for (j = 0; j < RQ_COUNT; j++) {
+                        for (unsigned int j = 0; j < RQ_COUNT; j++) {
                                 irq_spinlock_initialize(&cpus[i].rq[j].lock, "cpus[].rq[].lock");
                                 list_initialize(&cpus[i].rq[j].rq);