| /trunk/kernel/arch/ia32/include/boot/multiboot.h |
|---|
| File deleted |
| /trunk/kernel/arch/ia32/include/boot/boot.h |
|---|
| 42,12 → 42,11 |
| #define MULTIBOOT_HEADER_MAGIC 0x1BADB002 |
| #define MULTIBOOT_HEADER_FLAGS 0x00010003 |
| #define MULTIBOOT_LOADER_MAGIC 0x2BADB002 |
| #ifndef __ASM__ |
| #ifdef CONFIG_SMP |
| /* This is only a symbol so the type is dummy. Obtain the value using &. */ |
| extern int _hardcoded_unmapped_size; |
| #endif /* CONFIG_SMP */ |
| /trunk/kernel/arch/ia32/include/arch.h |
|---|
| 1,5 → 1,5 |
| /* |
| * Copyright (c) 2005 Martin Decky |
| * Copyright (c) 2009 Martin Decky |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| 35,9 → 35,9 |
| #ifndef KERN_ia32_ARCH_H_ |
| #define KERN_ia32_ARCH_H_ |
| #include <arch/boot/multiboot.h> |
| #include <genarch/multiboot/multiboot.h> |
| extern void arch_pre_main(uint32_t signature, const mb_info_t *mi); |
| extern void arch_pre_main(uint32_t, const multiboot_info_t *); |
| #endif |