Fixes multiboot flag check
authorBarret Rhoden <brho@cs.berkeley.edu>
Tue, 4 Nov 2014 22:11:57 +0000 (14:11 -0800)
committerBarret Rhoden <brho@cs.berkeley.edu>
Tue, 4 Nov 2014 22:11:57 +0000 (14:11 -0800)
This check was using the wrong flag, as in Ron's 6deacfb0d commit.  The code
should have been using the helper anyway.

kern/src/multiboot.c

index 0ededc9..89346d9 100644 (file)
@@ -121,7 +121,7 @@ bool mboot_region_collides(struct multiboot_info *mbi, uintptr_t base,
                                   (uintptr_t)mbi + sizeof(struct multiboot_info),
                                   base, end))
                return TRUE;
-       if ((mbi->flags & MULTIBOOT_INFO_ELF_SHDR)) {
+       if (mboot_has_mmaps(mbi)) {
                if (regions_collide_unsafe((uintptr_t)mbi->mmap_addr + KERNBASE,
                                           (uintptr_t)mbi->mmap_addr + KERNBASE
                                                                     + mbi->mmap_length,