summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-02-19 07:15:04 +0100
committerH. Peter Anvin <hpa@zytor.com>2010-02-19 07:15:04 +0100
commiteb572a5c7951288e265b3e8f9a5d37b6abb2e996 (patch)
tree3a1579200c106b8f5589a0a5704da8606b065e82
parentx86, setup: When restoring the screen, update boot_params.screen_info (diff)
downloadlinux-eb572a5c7951288e265b3e8f9a5d37b6abb2e996.tar.xz
linux-eb572a5c7951288e265b3e8f9a5d37b6abb2e996.zip
x86-64, setup: Inhibit decompressor output if video info is invalid
Inhibit output from the kernel decompressor if the video information is invalid. This was already the case for 32 bits, make 64 bits match. Signed-off-by: H. Peter Anvin <hpa@zytor.com> LKML-Reference: <tip-*@git.kernel.org>
-rw-r--r--arch/x86/boot/compressed/misc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index 3b22fe8ab91b..3487e86ed3cc 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -185,11 +185,9 @@ static void __putstr(int error, const char *s)
return;
#endif
-#ifdef CONFIG_X86_32
if (real_mode->screen_info.orig_video_mode == 0 &&
lines == 0 && cols == 0)
return;
-#endif
x = real_mode->screen_info.orig_x;
y = real_mode->screen_info.orig_y;