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

Timestamp:

2012-01-16T22:45:38Z (13 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/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;