Changeset 3fe58d3c in mainline for kernel/generic/include/mm

Timestamp:

2012-01-20T22:35:26Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e86b8f0

Parents:

321052f7 (diff), 7943c43 (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 from lp:~jakub/helenos/mm.

Location:

kernel/generic/include/mm

Files:

• frame.h (modified) (1 diff)
• km.h (modified) (2 diffs)

kernel/generic/include/mm/frame.h

@@ -83 +83 @@
 #define FRAME_TO_ZONE_FLAGS(ff) \
         ((((ff) & FRAME_LOWMEM) ? ZONE_LOWMEM : \
-            (((ff) & FRAME_HIGHMEM) ? ZONE_HIGHMEM : ZONE_NONE)) | \
-            (ZONE_AVAILABLE | ZONE_LOWMEM /* | ZONE_HIGHMEM */)) 
+            (((ff) & FRAME_HIGHMEM) ? ZONE_HIGHMEM : \
+            ZONE_LOWMEM /* | ZONE_HIGHMEM */)) | \
+            ZONE_AVAILABLE) 
 
 #define ZONE_FLAGS_MATCH(zf, f) \

kernel/generic/include/mm/km.h

@@ -37 +37 @@
 
 #include <typedefs.h>
+#include <mm/frame.h>
 
 extern void km_identity_init(void);
@@ -48 +49 @@
 extern bool km_is_non_identity(uintptr_t);
 
+extern uintptr_t km_temporary_page_get(uintptr_t *, frame_flags_t);
+extern void km_temporary_page_put(uintptr_t);
+
 #endif