Changeset b8b1e631 in mainline for kernel/arch/ia32/include/boot/boot.h
- Timestamp:
- 2011-12-03T11:10:06Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 30413b31
- Parents:
- 07fd4cd1 (diff), 1f5c9c96 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/ia32/include/boot/boot.h
r07fd4cd1 rb8b1e631 40 40 #define BOOT_STACK_SIZE 0x0400 41 41 42 #define MULTIBOOT_HEADER_MAGIC 0x1BADB00243 #define MULTIBOOT_HEADER_FLAGS 0x0001000344 45 #define MULTIBOOT_LOADER_MAGIC 0x2BADB00246 47 42 #ifndef __ASM__ 48 43
Note:
See TracChangeset
for help on using the changeset viewer.