Changes in kernel/generic/src/mm/frame.c [aaceebc4:905721b] in mainline

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