Skip to content

Commit

Permalink
x86/boot: Drop redundant code setting the root device
Browse files Browse the repository at this point in the history
The root device defaults to 0,0 and is no longer configurable at build
time [0], so there is no need for the build tool to ever write to this
field.

[0] 079f85e ("x86, build: Do not set the root_dev field in bzImage")

This change has no impact on the resulting bzImage binary.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20230912090051.4014114-23-ardb@google.com
  • Loading branch information
Ard Biesheuvel authored and Ingo Molnar committed Sep 15, 2023
1 parent 8eace5b commit 7448e8e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
2 changes: 1 addition & 1 deletion arch/x86/boot/header.S
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ root_flags: .word ROOT_RDONLY
syssize: .long 0 /* Filled in by build.c */
ram_size: .word 0 /* Obsolete */
vid_mode: .word SVGA_MODE
root_dev: .word 0 /* Filled in by build.c */
root_dev: .word 0 /* Default to major/minor 0/0 */
boot_flag: .word 0xAA55

# offset 512, entry point
Expand Down
7 changes: 0 additions & 7 deletions arch/x86/boot/tools/build.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;

#define DEFAULT_MAJOR_ROOT 0
#define DEFAULT_MINOR_ROOT 0
#define DEFAULT_ROOT_DEV (DEFAULT_MAJOR_ROOT << 8 | DEFAULT_MINOR_ROOT)

/* Minimal number of setup sectors */
#define SETUP_SECT_MIN 5
#define SETUP_SECT_MAX 64
Expand Down Expand Up @@ -399,9 +395,6 @@ int main(int argc, char ** argv)

update_pecoff_setup_and_reloc(i);

/* Set the default root device */
put_unaligned_le16(DEFAULT_ROOT_DEV, &buf[508]);

/* Open and stat the kernel file */
fd = open(argv[2], O_RDONLY);
if (fd < 0)
Expand Down

0 comments on commit 7448e8e

Please sign in to comment.