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

Timestamp:

2013-09-17T19:51:20Z (11 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

6ac3d27

Parents:

3efc35a (diff), ca62f86 (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 launchpad branch.

File:

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

kernel/generic/include/mm/frame.h

@@ -63 +63 @@
 /** Allocate a frame which cannot be identity-mapped. */
 #define FRAME_HIGHMEM     0x20
+/** Allocate a frame which needs to be from DMA zone. */
+#define FRAME_DMA         0x40
 
 typedef uint8_t zone_flags_t;
@@ -77 +79 @@
 /** Zone contains memory that cannot be identity-mapped */
 #define ZONE_HIGHMEM    0x10
+/** Zone contains memory suitable for old ISA DMA */
+#define ZONE_DMA        0x20
 
 /** Mask of zone bits that must be matched exactly. */
@@ -82 +86 @@
 
 #define FRAME_TO_ZONE_FLAGS(ff) \
-        ((((ff) & FRAME_LOWMEM) ? ZONE_LOWMEM : \
+        ((((ff) & FRAME_DMA) ? ZONE_DMA : \
+            (((ff) & FRAME_LOWMEM) ? ZONE_LOWMEM : \
             (((ff) & FRAME_HIGHMEM) ? ZONE_HIGHMEM : \
-            ZONE_LOWMEM /* | ZONE_HIGHMEM */)) | \
-            ZONE_AVAILABLE) 
+            ZONE_LOWMEM /* | ZONE_HIGHMEM */))) | \
+            ZONE_AVAILABLE)
 
 #define ZONE_FLAGS_MATCH(zf, f) \