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

Timestamp:

2013-09-09T17:52:40Z (11 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

f7bb6d1

Parents:

6ad185d (diff), a1ecb88 (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.

File:

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

kernel/generic/src/mm/frame.c

@@ -518 +518 @@
 NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t frame_idx)
 {
-        ASSERT(zone->flags & ZONE_AVAILABLE);
+        if (!(zone->flags & ZONE_AVAILABLE))
+                return;
+//      ASSERT(zone->flags & ZONE_AVAILABLE);
         
         frame_t *frame = zone_get_frame(zone, frame_idx);
@@ -935 +937 @@
                         }
                         
-                        if (confframe >= start + count)
-                                panic("Cannot find configuration data for zone.");
+                        if (confframe >= start + count) {
+                                flags &= ~ZONE_AVAILABLE;
+                                goto nonavail;
+//                              panic("Cannot find configuration data for zone.");
+                        }
                 }
                 
@@ -960 +965 @@
                 return znum;
         }
-        
+nonavail:
+        (void)0; // label trick
         /* Non-available zone */
         size_t znum = zones_insert_zone(start, count, flags);