Changeset 3f03199 in mainline for kernel/arch/arm32/src/mm/frame.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/arch/arm32/src/mm/frame.c (modified) (1 diff)

kernel/arch/arm32/src/mm/frame.c

@@ -88 +88 @@
 void boot_page_table_free(void)
 {
-        unsigned int i;
-        for (i = 0; i < BOOT_PAGE_TABLE_SIZE_IN_FRAMES; i++)
-                frame_free(i * FRAME_SIZE + BOOT_PAGE_TABLE_ADDRESS);
+        frame_free(BOOT_PAGE_TABLE_ADDRESS,
+            BOOT_PAGE_TABLE_SIZE_IN_FRAMES);
 }