Changeset 3f03199 in mainline for kernel/generic/src/sysinfo/stats.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/sysinfo/stats.c (modified) (2 diffs)

kernel/generic/src/sysinfo/stats.c

@@ -175 +175 @@
         
         /* Walk the B+ tree and count pages */
-        list_foreach(as->as_area_btree.leaf_list, cur) {
-                btree_node_t *node =
-                    list_get_instance(cur, btree_node_t, leaf_link);
-                
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t,
+            node) {
                 unsigned int i;
                 for (i = 0; i < node->keys; i++) {
@@ -218 +216 @@
         
         /* Walk the B+ tree and count pages */
-        list_foreach(as->as_area_btree.leaf_list, cur) {
-                btree_node_t *node =
-                    list_get_instance(cur, btree_node_t, leaf_link);
-                
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t, node) {
                 unsigned int i;
                 for (i = 0; i < node->keys; i++) {