Changeset 5c3243e in mainline for generic/include/mm/frame.h

Timestamp:

2006-02-08T14:01:58Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4c8715d2

Parents:

5e3757d

Message:

Fix mapping1 test.

Cleanup.

File:

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

generic/include/mm/frame.h

@@ -42 +42 @@
 #define ZONES_MAX       16      /**< Maximum number of zones in system */
 
-#define ZONE_JOIN       0x1  /**< If possible, merge with neighberhood zones */
-
+#define ZONE_JOIN       0x1     /**< If possible, merge with neighberhood zones */
 
 #define FRAME_KA                0x1     /* skip frames conflicting with user address space */
 #define FRAME_PANIC             0x2     /* panic on failure */
 #define FRAME_ATOMIC            0x4     /* do not panic and do not sleep on failure */
-#define FRAME_NO_RECLAIM        0x8     /* Do not start reclaiming when no free memory */
+#define FRAME_NO_RECLAIM        0x8     /* do not start reclaiming when no free memory */
 
 #define FRAME_OK                0       /* frame_alloc return status */
@@ -68 +67 @@
 static inline __address PFN2ADDR(pfn_t frame)
 {
-        return (__address)(frame << PAGE_WIDTH);
+        return (__address)(frame << FRAME_WIDTH);
 }
 
 static inline pfn_t ADDR2PFN(__address addr)
 {
-        return (pfn_t)(addr >> PAGE_WIDTH);
+        return (pfn_t)(addr >> FRAME_WIDTH);
 }
 
@@ -80 +79 @@
         if (!size)
                 return 0;
-        return (pfn_t)((size-1) >> PAGE_WIDTH)+1;
+        return (pfn_t)((size-1) >> FRAME_WIDTH)+1;
 }
 
@@ -88 +87 @@
 #define IS_BUDDY_LEFT_BLOCK_ABS(zone, frame)    (((frame_index_abs((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 0)
 #define IS_BUDDY_RIGHT_BLOCK_ABS(zone, frame)   (((frame_index_abs((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1)
-
 
 #define frame_alloc(order, flags)                               frame_alloc_generic(order, flags, NULL, NULL)