From 421e7ec66ea22165edfc89308bf4e600475f5542 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 20 Nov 2013 11:20:52 +0100 Subject: [PATCH] added missing multiboot #defines --- arch/x86/include/asm/multiboot.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/multiboot.h b/arch/x86/include/asm/multiboot.h index a4adae39..96d123cd 100644 --- a/arch/x86/include/asm/multiboot.h +++ b/arch/x86/include/asm/multiboot.h @@ -35,9 +35,11 @@ #ifdef CONFIG_MULTIBOOT -/* are there modules to do something with? */ +/// Does the bootloader provide mem_* fields? +#define MULTIBOOT_INFO_MEM 0x00000001 +/// Does the bootloader provide a list of modules? #define MULTIBOOT_INFO_MODS 0x00000008 -/* is there a full memory map? */ +/// Does the bootloader provide a full memory map? #define MULTIBOOT_INFO_MEM_MAP 0x00000040 typedef uint16_t multiboot_uint16_t; @@ -114,7 +116,6 @@ struct multiboot_info multiboot_uint16_t vbe_interface_off; multiboot_uint16_t vbe_interface_len; }; - typedef struct multiboot_info multiboot_info_t; struct multiboot_mmap_entry