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

Timestamp:

2010-05-21T07:50:04Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

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

kernel/generic/include/mm/frame.h

@@ -37 +37 @@
 #define KERN_FRAME_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 #include <mm/buddy.h>
@@ -169 +169 @@
 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);