summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorVivek Goyal <vgoyal@in.ibm.com>2006-11-01 16:10:21 -0500
committerSimon Horman <horms@verge.net.au>2006-11-08 12:58:09 +0900
commit1ac7cb4dd95229495ba7d2d5f490565d843b2e58 (patch)
tree8fb2078f89a8243df552e5fcecb5b05c0a1f9996 /include
parent94e4df27577d8a52dec41b1290365a64b4c4d1a2 (diff)
downloadkexec-tools-1ac7cb4dd95229495ba7d2d5f490565d843b2e58.tar.gz
kexec-tools: Support loading relocatable bzImage
o Modify bzImage loader to be able to recognize a relocatable bzImage and load it. Now bzImage loader can identify that bzImage is relocatable and can load the protected mode kernel code at a non 1MB addr. Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'include')
-rw-r--r--include/x86/x86-linux.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/include/x86/x86-linux.h b/include/x86/x86-linux.h
index daab50a..afe66bd 100644
--- a/include/x86/x86-linux.h
+++ b/include/x86/x86-linux.h
@@ -141,7 +141,10 @@ struct x86_linux_param_header {
uint32_t high_filesz; /* 0x254 */
uint8_t reserved15[0x2d0 - 0x258]; /* 0x258 */
#else
- uint8_t reserved15[0x2d0 - 0x230]; /* 0x230 */
+ /* 2.04+ */
+ uint32_t kernel_alignment; /* 0x230 */
+ uint8_t relocatable_kernel; /* 0x234 */
+ uint8_t reserved15[0x2d0 - 0x235]; /* 0x230 */
#endif
struct e820entry e820_map[E820MAX]; /* 0x2d0 */
/* 0x550 */
@@ -201,12 +204,15 @@ struct x86_linux_header {
uint32_t high_filesz; /* 0x254 */
uint32_t tail[32*1024 - 0x258]; /* 0x258 */
#else
- uint8_t tail[32*1024 - 0x230]; /* 0x230 */
+ uint32_t kernel_alignment; /* 0x230 */
+ uint8_t relocatable_kernel; /* 0x234 */
+ uint8_t tail[32*1024 - 0x235]; /* 0x230 */
#endif
} PACKED;
#endif /* ASSEMBLY */
#define DEFAULT_INITRD_ADDR_MAX 0x37FFFFFF
+#define DEFAULT_BZIMAGE_ADDR_MAX 0x37FFFFFF
#endif /* X86_LINUX_H */