From: H. Peter Anvin <hpa@zytor.com>
Date: Fri, 19 Feb 2010 06:15:04 +0000 (-0800)
Subject: x86-64, setup: Inhibit decompressor output if video info is invalid
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=eb572a5c7951288e265b3e8f9a5d37b6abb2e996;p=linux.git

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>
---

diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index 3b22fe8ab91bc..3487e86ed3ccc 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;