[PATCH] kexec,i386: Remove unnecessary if condition check

Zhang Yanfei
2013-01-10T09:27:54Z

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>
---
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 fd214a3..0605909 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,
--
1.7.1

_______________________________________________
kexec mailing list
kexec@lists.infradead.org