aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/boot/main.c
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2008-05-29 18:31:15 -0400
committerH. Peter Anvin <hpa@zytor.com>2008-05-30 17:00:47 -0700
commit3b6b9293d0f8e1b11630102013ca2a1dcef17d44 (patch)
treecd1fc0fac98d436b63a6e9062e5fdba72b8c5d17 /arch/x86/boot/main.c
parentx86: Use structs instead of hardcoded offsets in x86 boot decompressor. (diff)
downloadlinux-dev-3b6b9293d0f8e1b11630102013ca2a1dcef17d44.tar.xz
linux-dev-3b6b9293d0f8e1b11630102013ca2a1dcef17d44.zip
x86: Honor 'quiet' command line option in real mode boot decompressor.
This patch lets the early real mode code look for the 'quiet' option on the kernel command line and pass a loadflag to the decompressor. When this flag is set, we suppress the "Decompressing Linux... Parsing ELF... done." messages. Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot/main.c')
-rw-r--r--arch/x86/boot/main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c
index 77569a4a3be1..2296164b54d2 100644
--- a/arch/x86/boot/main.c
+++ b/arch/x86/boot/main.c
@@ -165,6 +165,10 @@ void main(void)
/* Set the video mode */
set_video();
+ /* Parse command line for 'quiet' and pass it to decompressor. */
+ if (cmdline_find_option_bool("quiet"))
+ boot_params.hdr.loadflags |= QUIET_FLAG;
+
/* Do the last things and invoke protected mode */
go_to_protected_mode();
}