Changeset 0aa06cbe in mainline for kernel/genarch/include

Timestamp:

2018-03-06T20:48:12Z (8 years ago)

Author:

GitHub <noreply@…>

Parents:

fd57cf17 (diff), 0c793e2 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-06 20:48:12)

git-committer:

GitHub <noreply@…> (2018-03-06 20:48:12)

Message:

Merge 0c793e2e9c4358a2bb2521d35eb36b273cf0283b into fd57cf17d12bbe3b41626a0b8708f075134a073e

Location:

kernel/genarch/include/genarch/multiboot

Files:

• multiboot.h (modified) (2 diffs)
• multiboot_info_struct.ag (deleted)
• multiboot_info_struct.h (added)
• multiboot_memmap_struct.ag (deleted)
• multiboot_memmap_struct.h (added)

kernel/genarch/include/genarch/multiboot/multiboot.h

@@ -36 +36 @@
 #define KERN_MULTIBOOT_H_
 
-#include <genarch/multiboot/multiboot_memmap_struct.h>
-#include <genarch/multiboot/multiboot_info_struct.h>
 
 #define MULTIBOOT_HEADER_MAGIC  0x1badb002
@@ -52 +50 @@
 #define MULTIBOOT_INFO_FLAGS_MMAP       0x40
 
-#ifndef __ASM__
+#ifdef __ASM__
+
+#include <genarch/multiboot/multiboot_memmap_struct.ag.h>
+#include <genarch/multiboot/multiboot_info_struct.ag.h>
+
+#else
+
+#include <genarch/multiboot/multiboot_memmap_struct.h>
+#include <genarch/multiboot/multiboot_info_struct.h>
 
 #include <typedefs.h>