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

Timestamp:

2012-01-24T02:27:43Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

230385c

Parents:

8afeb04 (diff), 2df6f6fe (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:

Mainline changes.

File:

• kernel/generic/include/mm/frame.h (modified) (1 diff)

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) \