aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/boot/compressed
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-02-19 01:15:04 -0500
committerH. Peter Anvin <hpa@zytor.com>2010-02-19 01:15:04 -0500
commiteb572a5c7951288e265b3e8f9a5d37b6abb2e996 (patch)
tree3a1579200c106b8f5589a0a5704da8606b065e82 /arch/x86/boot/compressed
parentf1f6baf8f1df29be38003089787e378567ce0086 (diff)
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>
Diffstat (limited to 'arch/x86/boot/compressed')
-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)
185 return; 185 return;
186#endif 186#endif
187 187
188#ifdef CONFIG_X86_32
189 if (real_mode->screen_info.orig_video_mode == 0 && 188 if (real_mode->screen_info.orig_video_mode == 0 &&
190 lines == 0 && cols == 0) 189 lines == 0 && cols == 0)
191 return; 190 return;
192#endif
193 191
194 x = real_mode->screen_info.orig_x; 192 x = real_mode->screen_info.orig_x;
195 y = real_mode->screen_info.orig_y; 193 y = real_mode->screen_info.orig_y;