]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
loader/i386/linux: Remove redundant code from in grub_cmd_linux()
authorTianjia Zhang <tianjia.zhang@linux.alibaba.com>
Mon, 11 Jan 2021 03:04:51 +0000 (11:04 +0800)
committerDaniel Kiper <daniel.kiper@oracle.com>
Tue, 2 Mar 2021 16:41:32 +0000 (17:41 +0100)
The preferred_address has been assigned to GRUB_LINUX_BZIMAGE_ADDR
during initialization in grub_cmd_linux(). The assignment here
is redundant and should be removed.

Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
grub-core/loader/i386/linux.c

index d7e68658f43302f9f3c5b8805567d2c856e6d790..0eea64a2073fd156fc68199d5904d595a04e0254 100644 (file)
@@ -751,14 +751,11 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
       prot_init_space = page_align (prot_size);
       if (relocatable)
        preferred_address = grub_le_to_cpu64 (lh.pref_address);
-      else
-       preferred_address = GRUB_LINUX_BZIMAGE_ADDR;
     }
   else
     {
       min_align = align;
       prot_size = prot_file_size;
-      preferred_address = GRUB_LINUX_BZIMAGE_ADDR;
       /* Usually, the compression ratio is about 50%.  */
       prot_init_space = page_align (prot_size) * 3;
     }