Changeset 9957a97 in mainline for kernel/arch/ia32/src/mm/frame.c

Timestamp:

2012-01-08T15:34:48Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

8989f2a7

Parents:

96cd5b4 (diff), 0a549cc (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 with mainline

File:

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

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

@@ -79 +79 @@
                         } else {
                                 conf = zone_external_conf_alloc(count);
-                                zone_create(pfn, count, conf,
-                                    ZONE_AVAILABLE | ZONE_HIGHMEM);
+                                if (conf != 0)
+                                        zone_create(pfn, count, conf,
+                                            ZONE_AVAILABLE | ZONE_HIGHMEM);
                         }
                 } else if ((e820table[i].type == MEMMAP_MEMORY_ACPI) ||