Changeset 7852625 in mainline for kernel/arch/ia64

Timestamp:

2012-01-05T17:49:20Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0a549cc

Parents:

9f0fb84

Message:

zone_external_conf_alloc() must be allowed to fail gracefully (by passing FRAME_ATOMIC to frame_alloc()), otherwise the frame_alloc_generic() might panic on the "Cannot wait for memory to become available" assertion in specific memory configurations

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);
                         }
                 }