Changes in kernel/generic/src/mm/frame.c [af96dd57:97bdb4a] in mainline

File:

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

kernel/generic/src/mm/frame.c

@@ -121 +121 @@
  *
  */
-NO_TRACE static size_t zones_insert_zone(pfn_t base, size_t count,
-    zone_flags_t flags)
+NO_TRACE static size_t zones_insert_zone(pfn_t base, size_t count)
 {
         if (zones.count + 1 == ZONES_MAX) {
@@ -132 +131 @@
         for (i = 0; i < zones.count; i++) {
                 /* Check for overlap */
-                if (overlaps(zones.info[i].base, zones.info[i].count,
-                    base, count)) {
-                        
-                        /*
-                         * If the overlaping zones are of the same type
-                         * and the new zone is completely within the previous
-                         * one, then quietly ignore the new zone.
-                         *
-                         */
-                        
-                        if ((zones.info[i].flags != flags) ||
-                            (!iswithin(zones.info[i].base, zones.info[i].count,
-                            base, count))) {
-                                printf("Zone (%p, %p) overlaps with previous zone (%p, %p)!\n",
-                                    PFN2ADDR(base), PFN2ADDR(count),
-                                    PFN2ADDR(zones.info[i].base),
-                                    PFN2ADDR(zones.info[i].count));
-                        }
-                        
+                if (overlaps(base, count,
+                    zones.info[i].base, zones.info[i].count)) {
+                        printf("Zone (%p, %p) overlaps with zone (%p, %p)!\n",
+                            PFN2ADDR(base), PFN2ADDR(base + count),
+                            PFN2ADDR(zones.info[i].base),
+                            PFN2ADDR(zones.info[i].base + zones.info[i].count));
                         return (size_t) -1;
                 }
@@ -161 +147 @@
         for (j = zones.count; j > i; j--) {
                 zones.info[j] = zones.info[j - 1];
-                if (zones.info[j].buddy_system != NULL)
-                        zones.info[j].buddy_system->data =
-                            (void *) &zones.info[j];
+                zones.info[j].buddy_system->data =
+                    (void *) &zones.info[j - 1];
         }
         
@@ -763 +748 @@
         for (i = z2 + 1; i < zones.count; i++) {
                 zones.info[i - 1] = zones.info[i];
-                if (zones.info[i - 1].buddy_system != NULL)
-                        zones.info[i - 1].buddy_system->data =
-                            (void *) &zones.info[i - 1];
+                zones.info[i - 1].buddy_system->data =
+                    (void *) &zones.info[i - 1];
         }
         
@@ -914 +898 @@
                 }
                 
-                size_t znum = zones_insert_zone(start, count, flags);
+                size_t znum = zones_insert_zone(start, count);
                 if (znum == (size_t) -1) {
                         irq_spinlock_unlock(&zones.lock, true);
@@ -937 +921 @@
         
         /* Non-available zone */
-        size_t znum = zones_insert_zone(start, count, flags);
+        size_t znum = zones_insert_zone(start, count);
         if (znum == (size_t) -1) {
                 irq_spinlock_unlock(&zones.lock, true);