summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-03-18 23:40:32 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-03-28 16:32:41 +0100
commit0faafc22a881696670426caf660be37e0e1effdc (patch)
tree200f784ac0c4c30d372346325a427aaaeef084d4
parentdd9e5cf1a51c7333d561fc694b68a756edf32b0f (diff)
multiboot.h: Add 64bit variant
* i386/include/mach/i386/multiboot.h (multiboot32_module): New structure.
-rw-r--r--i386/include/mach/i386/multiboot.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/i386/include/mach/i386/multiboot.h b/i386/include/mach/i386/multiboot.h
index c66ca032..5a532576 100644
--- a/i386/include/mach/i386/multiboot.h
+++ b/i386/include/mach/i386/multiboot.h
@@ -158,6 +158,23 @@ struct multiboot_module
unsigned reserved;
};
+#ifdef __x86_64__
+/* The mods_addr field above contains the physical address of the first
+ of 'mods_count' multiboot_module structures. */
+struct multiboot32_module
+{
+ /* Physical start and end addresses of the module data itself. */
+ unsigned mod_start;
+ unsigned mod_end;
+
+ /* Arbitrary ASCII string associated with the module. */
+ unsigned string;
+
+ /* Boot loader must set to 0; OS must ignore. */
+ unsigned reserved;
+};
+#endif
+
/* The mmap_addr field above contains the physical address of the first
of the AddrRangeDesc structure. "size" represents the size of the