Changeset 7943c43 in mainline for kernel/arch/ia64/src/mm/frame.c

Timestamp:

2012-01-16T22:45:38Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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.

File:

• kernel/arch/ia64/src/mm/frame.c (modified) (1 diff)

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

@@ -79 +79 @@
                                     ZONE_AVAILABLE | ZONE_LOWMEM);
                         } else {
-                                pfn_t conf;
-
-                                conf = zone_external_conf_alloc(count);
-                                zone_create(pfn, count, conf,
-                                    ZONE_AVAILABLE | ZONE_HIGHMEM);
+                                pfn_t conf = zone_external_conf_alloc(count);
+                                if (conf != 0)
+                                        zone_create(pfn, count, conf,
+                                            ZONE_AVAILABLE | ZONE_HIGHMEM);
                         }
                 }