Commit-ID: 9f4e4392cbf72d731a489a3217fe810820b8ba96
Gitweb: http://git.kernel.org/tip/9f4e4392cbf72d731a489a3217fe810820b8ba96
Author: Joe Millenbach <jmillenbach@xxxxxxxxx>
AuthorDate: Thu, 19 Jul 2012 18:04:36 -0700
Committer: H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Sat, 21 Jul 2012 11:07:15 -0700
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: Joe Millenbach <jmillenbach@xxxxxxxxx>
Link: http://lkml.kernel.org/r/1342746282-28497-2-git-send-email-jmillenbach@xxxxxxxxx
Signed-off-by: Gokul Caushik <caushik1@xxxxxxxxx>
Reviewed-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
---
arch/x86/boot/compressed/misc.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index 7116dcb..8f2355d 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -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);
@@ -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);
@@ -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;
@@ -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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|