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

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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;