summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2013-02-21 20:07:50 -0800
committerSimon Horman <horms@verge.net.au>2013-03-05 10:36:21 +0900
commit8f0dc4b278ec2d6a3411e603c5b7f1bb8c5a92e6 (patch)
treedf53bfd96d0bbd5f31c1c6c6f6492e74a5e341ea
parent566ca8a12145196b00ad37939cfd58a97f96ba89 (diff)
kexec, x86: set booloader id in setup_header
set LOADER_TYPE_KEXEC Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Simon Horman <horms@verge.net.au>
-rw-r--r--include/x86/x86-linux.h1
-rw-r--r--kexec/arch/i386/x86-linux-setup.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/x86/x86-linux.h b/include/x86/x86-linux.h
index 8f7a797..ea11042 100644
--- a/include/x86/x86-linux.h
+++ b/include/x86/x86-linux.h
@@ -142,6 +142,7 @@ struct x86_linux_param_header {
#define LOADER_TYPE_BOOTSECT_LOADER 2
#define LOADER_TYPE_SYSLINUX 3
#define LOADER_TYPE_ETHERBOOT 4
+#define LOADER_TYPE_KEXEC 0x0D
#define LOADER_TYPE_UNKNOWN 0xFF
uint8_t loader_flags; /* 0x211 */
uint8_t reserved12[2]; /* 0x212 */
diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c
index ef62553..d09c6ce 100644
--- a/kexec/arch/i386/x86-linux-setup.c
+++ b/kexec/arch/i386/x86-linux-setup.c
@@ -56,7 +56,7 @@ void setup_linux_bootloader_parameters(
unsigned long initrd_base, initrd_addr_max;
/* Say I'm a boot loader */
- real_mode->loader_type = LOADER_TYPE_UNKNOWN;
+ real_mode->loader_type = LOADER_TYPE_KEXEC << 4;
/* No loader flags */
real_mode->loader_flags = 0;