提交 9f4e4392 编写于 作者: J Joe Millenbach 提交者: H. Peter Anvin

x86, boot: Removed quiet flag and switched quiet output to debug flag

There are only 3 uses of the quiet flag and they all protect output that
is only useful for debugging the stub, therefore we switched to using the
debug flag for all extra output.
Signed-off-by: NJoe Millenbach <jmillenbach@gmail.com>
Link: http://lkml.kernel.org/r/1342746282-28497-2-git-send-email-jmillenbach@gmail.comSigned-off-by: NGokul Caushik <caushik1@gmail.com>
Reviewed-by: NJosh Triplett <josh@joshtriplett.org>
Signed-off-by: NH. Peter Anvin <hpa@zytor.com>
上级 6887a413
...@@ -108,7 +108,6 @@ static void error(char *m); ...@@ -108,7 +108,6 @@ static void error(char *m);
* This is set up by the setup-routine at boot-time * This is set up by the setup-routine at boot-time
*/ */
struct boot_params *real_mode; /* Pointer to real-mode data */ struct boot_params *real_mode; /* Pointer to real-mode data */
static int quiet;
static int debug; static int debug;
void *memset(void *s, int c, size_t n); void *memset(void *s, int c, size_t n);
...@@ -294,7 +293,7 @@ static void parse_elf(void *output) ...@@ -294,7 +293,7 @@ static void parse_elf(void *output)
return; return;
} }
if (!quiet) if (debug)
putstr("Parsing ELF... "); putstr("Parsing ELF... ");
phdrs = malloc(sizeof(*phdrs) * ehdr.e_phnum); phdrs = malloc(sizeof(*phdrs) * ehdr.e_phnum);
...@@ -332,8 +331,6 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap, ...@@ -332,8 +331,6 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
{ {
real_mode = rmode; real_mode = rmode;
if (cmdline_find_option_bool("quiet"))
quiet = 1;
if (cmdline_find_option_bool("debug")) if (cmdline_find_option_bool("debug"))
debug = 1; debug = 1;
...@@ -369,11 +366,11 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap, ...@@ -369,11 +366,11 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
error("Wrong destination address"); error("Wrong destination address");
#endif #endif
if (!quiet) if (debug)
putstr("\nDecompressing Linux... "); putstr("\nDecompressing Linux... ");
decompress(input_data, input_len, NULL, NULL, output, NULL, error); decompress(input_data, input_len, NULL, NULL, output, NULL, error);
parse_elf(output); parse_elf(output);
if (!quiet) if (debug)
putstr("done.\nBooting the kernel.\n"); putstr("done.\nBooting the kernel.\n");
return; return;
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册