[tip:x86/setup] x86-64, setup: Inhibit decompressor output if video info is invalid

[tip-bot for H. Peter Anvin]

Commit-ID:  eb572a5c7951288e265b3e8f9a5d37b6abb2e996
Gitweb:     http://git.kernel.org/tip/eb572a5c7951288e265b3e8f9a5d37b6abb2e996
Author:     H. Peter Anvin <hpa@xxxxxxxxx>
AuthorDate: Thu, 18 Feb 2010 22:15:04 -0800
Committer:  H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Thu, 18 Feb 2010 22:15:04 -0800

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@xxxxxxxxx>
LKML-Reference: <tip-*@git.kernel.org>
---
 arch/x86/boot/compressed/misc.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index 3b22fe8..3487e86 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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/