Changeset 7852625 in mainline for kernel/arch/mips32/src/mm/frame.c

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/mips32/src/mm/frame.c (modified) (1 diff)

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

@@ -156 +156 @@
         } else {
                 conf_frame = zone_external_conf_alloc(count);
-                zone_create(first, count, conf_frame,
-                    ZONE_AVAILABLE | ZONE_HIGHMEM);
-        }
-                
-                
+                if (conf_frame != 0)
+                        zone_create(first, count, conf_frame,
+                            ZONE_AVAILABLE | ZONE_HIGHMEM);
+        }
+        
         if (phys_regions_count < MAX_REGIONS) {
                 phys_regions[phys_regions_count].start = first;