diff options
| author | Zhang Yanfei <zhangyanfei@cn.fujitsu.com> | 2013-01-10 17:25:04 +0800 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2013-01-11 09:32:14 +0900 |
| commit | 504914dddcc57fd2099e11c0f5cac22a28ecce2a (patch) | |
| tree | 3c1c350c67df90fd27abb6d51ff4ed659ebcacaf | |
| parent | 3af8bee323bfb7894e760ac32f18e3ef082b2c5b (diff) | |
| download | kexec-tools-504914dddcc57fd2099e11c0f5cac22a28ecce2a.tar.gz | |
kexec,i386: Remove unnecessary if condition check
If we load the relocatable bzImage, the boot protocol must >= 2.05,
So the if condition check is unnecessary.
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/i386/kexec-bzImage.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kexec/arch/i386/kexec-bzImage.c b/kexec/arch/i386/kexec-bzImage.c index fd214a36..06059098 100644 --- a/kexec/arch/i386/kexec-bzImage.c +++ b/kexec/arch/i386/kexec-bzImage.c @@ -245,10 +245,8 @@ int do_bzImage_load(struct kexec_info *info, unsigned long kern_align = real_mode->kernel_alignment; unsigned long kernel32_max_addr = DEFAULT_BZIMAGE_ADDR_MAX; - if (real_mode->protocol_version >= 0x0203) { - if (kernel32_max_addr > real_mode->initrd_addr_max) - kernel32_max_addr = real_mode->initrd_addr_max; - } + if (kernel32_max_addr > real_mode->initrd_addr_max) + kernel32_max_addr = real_mode->initrd_addr_max; kernel32_load_addr = add_buffer(info, kernel + kern16_size, size, size, kern_align, |