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

Timestamp:

2011-07-12T03:00:14Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

6817eba

Parents:

eca52a8 (diff), 026793d (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

@@ -58 +58 @@
                 unsigned int i;
                 for (i = 0; i < bootinfo->memmap_items; i++) {
-                        if (bootinfo->memmap[i].type == EFI_MEMMAP_FREE_MEM) {
+                        if (bootinfo->memmap[i].type == MEMMAP_FREE_MEM) {
                                 uint64_t base = bootinfo->memmap[i].base;
                                 uint64_t size = bootinfo->memmap[i].size;