Changeset 6843a9c in mainline for kernel/generic/src/console/cmd.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/console/cmd.c (modified) (2 diffs)

kernel/generic/src/console/cmd.c

@@ -724 +724 @@
                 thread_t *thread;
                 if ((thread = thread_create((void (*)(void *)) cmd_call0,
-                    (void *) argv, TASK, THREAD_FLAG_WIRED, "call0", false))) {
-                        irq_spinlock_lock(&thread->lock, true);
-                        thread->cpu = &cpus[i];
-                        irq_spinlock_unlock(&thread->lock, true);
-                        
+                    (void *) argv, TASK, THREAD_FLAG_NONE, "call0"))) {
                         printf("cpu%u: ", i);
-                        
+                        thread_wire(thread, &cpus[i]);
                         thread_ready(thread);
                         thread_join(thread);
@@ -906 +902 @@
                    ((char *) argv->buffer)[0] <= '9') {
                 uint64_t value;
-                rc = str_uint64((char *) argv->buffer, NULL, 0, true, &value);
+                rc = str_uint64_t((char *) argv->buffer, NULL, 0, true, &value);
                 if (rc == EOK)
                         addr = (uintptr_t) value;