]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
x86-64, setup: Inhibit decompressor output if video info is invalid
authorH. Peter Anvin <hpa@zytor.com>
Fri, 19 Feb 2010 06:15:04 +0000 (22:15 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 19 Feb 2010 06:15:04 +0000 (22:15 -0800)
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>

arch/x86/boot/compressed/misc.c

index 3b22fe8ab91bc90d2e25f2d33e53d315860e3c30..3487e86ed3cccba81a1c0e19a67f1f8542953356 100644 (file)
@@ -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;