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

File:

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

kernel/generic/src/mm/frame.c

@@ -75 +75 @@
 /********************/
 
-NO_TRACE static inline size_t frame_index(zone_t *zone, frame_t *frame)
+static inline size_t frame_index(zone_t *zone, frame_t *frame)
 {
         return (size_t) (frame - zone->frames);
 }
 
-NO_TRACE static inline size_t frame_index_abs(zone_t *zone, frame_t *frame)
+static inline size_t frame_index_abs(zone_t *zone, frame_t *frame)
 {
         return (size_t) (frame - zone->frames) + zone->base;
 }
 
-NO_TRACE static inline bool frame_index_valid(zone_t *zone, size_t index)
+static inline bool frame_index_valid(zone_t *zone, size_t index)
 {
         return (index < zone->count);
 }
 
-NO_TRACE static inline size_t make_frame_index(zone_t *zone, frame_t *frame)
+static inline size_t make_frame_index(zone_t *zone, frame_t *frame)
 {
         return (frame - zone->frames);
@@ -100 +100 @@
  *
  */
-NO_TRACE static void frame_initialize(frame_t *frame)
+static void frame_initialize(frame_t *frame)
 {
         frame->refcount = 1;
@@ -121 +121 @@
  *
  */
-NO_TRACE static size_t zones_insert_zone(pfn_t base, size_t count)
+static size_t zones_insert_zone(pfn_t base, size_t count)
 {
         if (zones.count + 1 == ZONES_MAX) {
@@ -133 +133 @@
                 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));
+                        printf("Zones overlap!\n");
                         return (size_t) -1;
                 }
@@ -165 +162 @@
  */
 #ifdef CONFIG_DEBUG
-NO_TRACE static size_t total_frames_free(void)
+static size_t total_frames_free(void)
 {
         size_t total = 0;
@@ -188 +185 @@
  *
  */
-NO_TRACE size_t find_zone(pfn_t frame, size_t count, size_t hint)
+size_t find_zone(pfn_t frame, size_t count, size_t hint)
 {
         if (hint >= zones.count)
@@ -209 +206 @@
 
 /** @return True if zone can allocate specified order */
-NO_TRACE static bool zone_can_alloc(zone_t *zone, uint8_t order)
+static bool zone_can_alloc(zone_t *zone, uint8_t order)
 {
         return (zone_flags_available(zone->flags)
@@ -225 +222 @@
  *
  */
-NO_TRACE static size_t find_free_zone(uint8_t order, zone_flags_t flags,
-    size_t hint)
+static size_t find_free_zone(uint8_t order, zone_flags_t flags, size_t hint)
 {
         if (hint >= zones.count)
@@ -266 +262 @@
  *
  */
-NO_TRACE static link_t *zone_buddy_find_block(buddy_system_t *buddy,
-    link_t *child, uint8_t order)
+static link_t *zone_buddy_find_block(buddy_system_t *buddy, link_t *child,
+    uint8_t order)
 {
         frame_t *frame = list_get_instance(child, frame_t, buddy_link);
@@ -289 +285 @@
  *
  */
-NO_TRACE static link_t *zone_buddy_find_buddy(buddy_system_t *buddy,
-    link_t *block)
+static link_t *zone_buddy_find_buddy(buddy_system_t *buddy, link_t *block) 
 {
         frame_t *frame = list_get_instance(block, frame_t, buddy_link);
@@ -326 +321 @@
  *
  */
-NO_TRACE static link_t *zone_buddy_bisect(buddy_system_t *buddy, link_t *block)
+static link_t *zone_buddy_bisect(buddy_system_t *buddy, link_t *block)
 {
         frame_t *frame_l = list_get_instance(block, frame_t, buddy_link);
@@ -344 +339 @@
  *
  */
-NO_TRACE static link_t *zone_buddy_coalesce(buddy_system_t *buddy,
-    link_t *block_1, link_t *block_2)
+static link_t *zone_buddy_coalesce(buddy_system_t *buddy, link_t *block_1,
+    link_t *block_2)
 {
         frame_t *frame1 = list_get_instance(block_1, frame_t, buddy_link);
@@ -360 +355 @@
  *
  */
-NO_TRACE static void zone_buddy_set_order(buddy_system_t *buddy, link_t *block,
+static void zone_buddy_set_order(buddy_system_t *buddy, link_t *block,
     uint8_t order)
 {
@@ -374 +369 @@
  *
  */
-NO_TRACE static uint8_t zone_buddy_get_order(buddy_system_t *buddy,
-    link_t *block)
+static uint8_t zone_buddy_get_order(buddy_system_t *buddy, link_t *block)
 {
         return list_get_instance(block, frame_t, buddy_link)->buddy_order;
@@ -386 +380 @@
  *
  */
-NO_TRACE static void zone_buddy_mark_busy(buddy_system_t *buddy, link_t *block)
+static void zone_buddy_mark_busy(buddy_system_t *buddy, link_t * block)
 {
         list_get_instance(block, frame_t, buddy_link)->refcount = 1;
@@ -395 +389 @@
  * @param buddy Buddy system.
  * @param block Buddy system block.
- *
- */
-NO_TRACE static void zone_buddy_mark_available(buddy_system_t *buddy,
-    link_t *block)
+ */
+static void zone_buddy_mark_available(buddy_system_t *buddy, link_t *block)
 {
         list_get_instance(block, frame_t, buddy_link)->refcount = 0;
@@ -429 +421 @@
  *
  */
-NO_TRACE static pfn_t zone_frame_alloc(zone_t *zone, uint8_t order)
+static pfn_t zone_frame_alloc(zone_t *zone, uint8_t order)
 {
         ASSERT(zone_flags_available(zone->flags));
@@ -457 +449 @@
  *
  */
-NO_TRACE static void zone_frame_free(zone_t *zone, size_t frame_idx)
+static void zone_frame_free(zone_t *zone, size_t frame_idx)
 {
         ASSERT(zone_flags_available(zone->flags));
@@ -478 +470 @@
 
 /** Return frame from zone. */
-NO_TRACE static frame_t *zone_get_frame(zone_t *zone, size_t frame_idx)
+static frame_t *zone_get_frame(zone_t *zone, size_t frame_idx)
 {
         ASSERT(frame_idx < zone->count);
@@ -485 +477 @@
 
 /** Mark frame in zone unavailable to allocation. */
-NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t frame_idx)
+static void zone_mark_unavailable(zone_t *zone, size_t frame_idx)
 {
         ASSERT(zone_flags_available(zone->flags));
@@ -514 +506 @@
  *
  */
-NO_TRACE static void zone_merge_internal(size_t z1, size_t z2, zone_t *old_z1,
-    buddy_system_t *buddy)
+static void zone_merge_internal(size_t z1, size_t z2, zone_t *old_z1, buddy_system_t *buddy)
 {
         ASSERT(zone_flags_available(zones.info[z1].flags));
@@ -611 +602 @@
  *
  */
-NO_TRACE static void return_config_frames(size_t znum, pfn_t pfn, size_t count)
+static void return_config_frames(size_t znum, pfn_t pfn, size_t count)
 {
         ASSERT(zone_flags_available(zones.info[znum].flags));
@@ -646 +637 @@
  *
  */
-NO_TRACE static void zone_reduce_region(size_t znum, pfn_t frame_idx,
-    size_t count)
+static void zone_reduce_region(size_t znum, pfn_t frame_idx, size_t count)
 {
         ASSERT(zone_flags_available(zones.info[znum].flags));
@@ -787 +777 @@
  *
  */
-NO_TRACE static void zone_construct(zone_t *zone, buddy_system_t *buddy,
-    pfn_t start, size_t count, zone_flags_t flags)
+static void zone_construct(zone_t *zone, buddy_system_t *buddy, pfn_t start,
+    size_t count, zone_flags_t flags)
 {
         zone->base = start;
@@ -831 +821 @@
  *
  */
-size_t zone_conf_size(size_t count)
+uintptr_t zone_conf_size(size_t count)
 {
         return (count * sizeof(frame_t) + buddy_conf_size(fnzb(count)));
@@ -1118 +1108 @@
  *
  */
-NO_TRACE void frame_reference_add(pfn_t pfn)
+void frame_reference_add(pfn_t pfn)
 {
         irq_spinlock_lock(&zones.lock, true);
@@ -1137 +1127 @@
  *
  */
-NO_TRACE void frame_mark_unavailable(pfn_t start, size_t count)
+void frame_mark_unavailable(pfn_t start, size_t count)
 {
         irq_spinlock_lock(&zones.lock, true);