Changeset 948911d in mainline for kernel/arch/arm32/src/mm/frame.c

Timestamp:

2012-01-24T02:27:43Z (12 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/arch/arm32/src/mm/frame.c (modified) (1 diff)

kernel/arch/arm32/src/mm/frame.c

@@ -60 +60 @@
         } else {
                 pfn_t conf = zone_external_conf_alloc(SIZE2FRAMES(size));
-
-                zone_create(ADDR2PFN(base), SIZE2FRAMES(size), conf,
-                    ZONE_AVAILABLE | ZONE_HIGHMEM);
+                if (conf != 0)
+                        zone_create(ADDR2PFN(base), SIZE2FRAMES(size), conf,
+                            ZONE_AVAILABLE | ZONE_HIGHMEM);
         }