Changeset 8e7c9fe in mainline for kernel/generic/src/mm/frame.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• kernel/generic/src/mm/frame.c (modified) (2 diffs)

kernel/generic/src/mm/frame.c

@@ -391 +391 @@
         
         /* Allocate frames from zone */
-        size_t index;
+        size_t index = (size_t) -1;
         int avail = bitmap_allocate_range(&zone->bitmap, count, zone->base,
             FRAME_LOWPRIO, constraint, &index);
         
         ASSERT(avail);
+        ASSERT(index != (size_t) -1);
         
         /* Update frame reference count */
@@ -901 +902 @@
                 }
                 
-#ifdef CONFIG_DEBUG
                 size_t avail = frame_total_free_get_internal();
-#endif
                 
                 irq_spinlock_unlock(&zones.lock, true);