Changeset db71e2a in mainline for uspace/app/mkmfs/mkmfs.c

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/app/mkmfs/mkmfs.c (modified) (1 diff)

uspace/app/mkmfs/mkmfs.c

@@ -649 +649 @@
                 mark_bmap(ibmap_buf, i, FREE);
 
-        for (i = sb->first_data_zone + 1; i < sb->n_zones; ++i)
+        for (i = 2; i < sb->n_zones - sb->first_data_zone; ++i)
                 mark_bmap(zbmap_buf, i, FREE);