Changes in kernel/generic/include/mm/frame.h [bbfdf62:9dae191e] in mainline

File:

• kernel/generic/include/mm/frame.h (modified) (7 diffs)

kernel/generic/include/mm/frame.h

@@ -38 +38 @@
 
 #include <typedefs.h>
-#include <trace.h>
 #include <adt/list.h>
 #include <mm/buddy.h>
@@ -82 +81 @@
 
 typedef struct {
-        size_t refcount;      /**< Tracking of shared frames */
+        size_t refcount;     /**< Tracking of shared frames */
         uint8_t buddy_order;  /**< Buddy system block order */
         link_t buddy_link;    /**< Link to the next free block inside
@@ -92 +91 @@
         pfn_t base;                    /**< Frame_no of the first frame
                                         in the frames array */
-        size_t count;                  /**< Size of zone */
-        size_t free_count;             /**< Number of free frame_t
+        size_t count;                 /**< Size of zone */
+        size_t free_count;            /**< Number of free frame_t
                                         structures */
-        size_t busy_count;             /**< Number of busy frame_t
+        size_t busy_count;            /**< Number of busy frame_t
                                         structures */
         zone_flags_t flags;            /**< Type of the zone */
@@ -109 +108 @@
  */
 typedef struct {
-        IRQ_SPINLOCK_DECLARE(lock);
+        SPINLOCK_DECLARE(lock);
         size_t count;
         zone_t info[ZONES_MAX];
@@ -116 +115 @@
 extern zones_t zones;
 
-NO_TRACE static inline uintptr_t PFN2ADDR(pfn_t frame)
+static inline uintptr_t PFN2ADDR(pfn_t frame)
 {
         return (uintptr_t) (frame << FRAME_WIDTH);
 }
 
-NO_TRACE static inline pfn_t ADDR2PFN(uintptr_t addr)
+static inline pfn_t ADDR2PFN(uintptr_t addr)
 {
         return (pfn_t) (addr >> FRAME_WIDTH);
 }
 
-NO_TRACE static inline size_t SIZE2FRAMES(size_t size)
+static inline size_t SIZE2FRAMES(size_t size)
 {
         if (!size)
@@ -133 +132 @@
 }
 
-NO_TRACE static inline size_t FRAMES2SIZE(size_t frames)
+static inline size_t FRAMES2SIZE(size_t frames)
 {
         return (size_t) (frames << FRAME_WIDTH);
 }
 
-NO_TRACE static inline bool zone_flags_available(zone_flags_t flags)
+static inline bool zone_flags_available(zone_flags_t flags)
 {
         return ((flags & (ZONE_RESERVED | ZONE_FIRMWARE)) == 0);
@@ -167 +166 @@
 extern void frame_set_parent(pfn_t, void *, size_t);
 extern void frame_mark_unavailable(pfn_t, size_t);
-extern size_t zone_conf_size(size_t);
+extern uintptr_t zone_conf_size(size_t);
 extern bool zone_merge(size_t, size_t);
 extern void zone_merge_all(void);