Skip to content

Commit

Permalink
x86, boot: Removed quiet flag and switched quiet output to debug flag
Browse files Browse the repository at this point in the history
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: Joe Millenbach <jmillenbach@gmail.com>
Link: http://lkml.kernel.org/r/1342746282-28497-2-git-send-email-jmillenbach@gmail.com
Signed-off-by: Gokul Caushik <caushik1@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
  • Loading branch information
Joe Millenbach authored and H. Peter Anvin committed Jul 21, 2012
1 parent 6887a41 commit 9f4e439
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions arch/x86/boot/compressed/misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ static void error(char *m);
* This is set up by the setup-routine at boot-time
*/
struct boot_params *real_mode; /* Pointer to real-mode data */
static int quiet;
static int debug;

void *memset(void *s, int c, size_t n);
Expand Down Expand Up @@ -294,7 +293,7 @@ static void parse_elf(void *output)
return;
}

if (!quiet)
if (debug)
putstr("Parsing ELF... ");

phdrs = malloc(sizeof(*phdrs) * ehdr.e_phnum);
Expand Down Expand Up @@ -332,8 +331,6 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
{
real_mode = rmode;

if (cmdline_find_option_bool("quiet"))
quiet = 1;
if (cmdline_find_option_bool("debug"))
debug = 1;

Expand Down Expand Up @@ -369,11 +366,11 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
error("Wrong destination address");
#endif

if (!quiet)
if (debug)
putstr("\nDecompressing Linux... ");
decompress(input_data, input_len, NULL, NULL, output, NULL, error);
parse_elf(output);
if (!quiet)
if (debug)
putstr("done.\nBooting the kernel.\n");
return;
}

0 comments on commit 9f4e439

Please sign in to comment.