Changeset 7aaed09 in mainline for kernel/arch/amd64/include

Timestamp:

2011-12-18T14:02:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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.

Location:

kernel/arch/amd64/include

Files:

• arch.h (modified) (1 diff)
• boot/boot.h (modified) (1 diff)

kernel/arch/amd64/include/arch.h

@@ -38 +38 @@
 #include <genarch/multiboot/multiboot.h>
 
-extern void arch_pre_main(uint32_t, const multiboot_info_t *);
+extern void arch_pre_main(uint32_t, void *);
 
 #endif

kernel/arch/amd64/include/boot/boot.h

@@ -40 +40 @@
 #define BOOT_STACK_SIZE  0x000400
 
-#define MULTIBOOT_HEADER_MAGIC  0x1BADB002
-#define MULTIBOOT_HEADER_FLAGS  0x00010003
-
 #ifndef __ASM__