Changes in kernel/generic/include/mm/frame.h [98000fb:96b02eb9] in mainline

File:

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

kernel/generic/include/mm/frame.h

@@ -37 +37 @@
 #define KERN_FRAME_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
+#include <trace.h>
 #include <adt/list.h>
 #include <mm/buddy.h>
@@ -81 +82 @@
 
 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
@@ -91 +92 @@
         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 */
@@ -108 +109 @@
  */
 typedef struct {
-        SPINLOCK_DECLARE(lock);
+        IRQ_SPINLOCK_DECLARE(lock);
         size_t count;
         zone_t info[ZONES_MAX];
@@ -115 +116 @@
 extern zones_t zones;
 
-static inline uintptr_t PFN2ADDR(pfn_t frame)
+NO_TRACE static inline uintptr_t PFN2ADDR(pfn_t frame)
 {
         return (uintptr_t) (frame << FRAME_WIDTH);
 }
 
-static inline pfn_t ADDR2PFN(uintptr_t addr)
+NO_TRACE static inline pfn_t ADDR2PFN(uintptr_t addr)
 {
         return (pfn_t) (addr >> FRAME_WIDTH);
 }
 
-static inline size_t SIZE2FRAMES(size_t size)
+NO_TRACE static inline size_t SIZE2FRAMES(size_t size)
 {
         if (!size)
@@ -132 +133 @@
 }
 
-static inline size_t FRAMES2SIZE(size_t frames)
+NO_TRACE static inline size_t FRAMES2SIZE(size_t frames)
 {
         return (size_t) (frames << FRAME_WIDTH);
 }
 
-static inline bool zone_flags_available(zone_flags_t flags)
+NO_TRACE static inline bool zone_flags_available(zone_flags_t flags)
 {
         return ((flags & (ZONE_RESERVED | ZONE_FIRMWARE)) == 0);
@@ -143 +144 @@
 
 #define IS_BUDDY_ORDER_OK(index, order) \
-    ((~(((unative_t) -1) << (order)) & (index)) == 0)
+    ((~(((sysarg_t) -1) << (order)) & (index)) == 0)
 #define IS_BUDDY_LEFT_BLOCK(zone, frame) \
     (((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x01) == 0)
@@ -166 +167 @@
 extern void frame_set_parent(pfn_t, void *, size_t);
 extern void frame_mark_unavailable(pfn_t, size_t);
-extern uintptr_t zone_conf_size(size_t);
+extern size_t zone_conf_size(size_t);
 extern bool zone_merge(size_t, size_t);
 extern void zone_merge_all(void);
-extern uint64_t zone_total_size(void);
+extern uint64_t zones_total_size(void);
+extern void zones_stats(uint64_t *, uint64_t *, uint64_t *, uint64_t *);
 
 /*
  * Console functions
  */
-extern void zone_print_list(void);
+extern void zones_print_list(void);
 extern void zone_print_one(size_t);