Changeset 82d56184 in mainline for kernel/generic/include/mm/frame.h

Timestamp:

2011-06-01T21:05:19Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5cac9cd

Parents:

682cfceb (diff), 5d1b3aa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

kernel/generic/include/mm/frame.h

@@ -44 +44 @@
 #include <arch/mm/page.h>
 #include <arch/mm/frame.h>
-
-#define ONE_FRAME    0
-#define TWO_FRAMES   1
-#define FOUR_FRAMES  2
-
-
-#ifdef ARCH_STACK_FRAMES
-        #define STACK_FRAMES  ARCH_STACK_FRAMES
-#else
-        #define STACK_FRAMES  ONE_FRAME
-#endif
 
 /** Maximum number of zones in the system. */
@@ -164 +153 @@
 extern void frame_free_noreserve(uintptr_t);
 extern void frame_reference_add(pfn_t);
+extern size_t frame_total_free_get(void);
 
 extern size_t find_zone(pfn_t, size_t, size_t);