x86/boot/edd: return from query_edd so early as we can if EDD disabled
PATCH 1/1 x86/boot/edd: return from query_edd so early as we can if EDD disabled
Return from query_edd routine as early as we can if CONFIG_EDD_OFF was set 'Y' and 'edd=on | skip[mbr]' parameter have not been transfered to the kernel.
Signed-off-by Alexander Kuleshov <[email protected]>
--- arch/x86/boot/edd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86/boot/edd.c +4 -4
@@ -139,19 +139,19 @@ void query_edd(void) do_mbr =0 ; }else if (!strcmp (eddarg,"off" )) - do_edd =0 ; +return ;else if (!strcmp (eddarg,"on" )) do_edd =1 ; } +if (!do_edd) +return ; + be_quiet =cmdline_find_option_bool ("quiet" ); edp = boot_params.eddbuf; mbrptr = boot_params.edd_mbr_sig_buffer; -if (!do_edd) -return ; -/* Bugs in OnBoard or AddOnCards Bios may hang the EDD probe, * so give a hint if this happens. */
Signature · 1 line
2.3.0.rc0.44.ga94655d.dirty