Changeset 3f03199 in mainline for kernel/generic/src/proc/scheduler.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/proc/scheduler.c (modified) (1 diff)

kernel/generic/src/proc/scheduler.c

@@ -739 +739 @@
                         
                         printf("\trq[%u]: ", i);
-                        list_foreach(cpus[cpu].rq[i].rq, cur) {
-                                thread_t *thread = list_get_instance(cur,
-                                    thread_t, rq_link);
+                        list_foreach(cpus[cpu].rq[i].rq, rq_link, thread_t,
+                            thread) {
                                 printf("%" PRIu64 "(%s) ", thread->tid,
                                     thread_states[thread->state]);