From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933247AbbGGUWe (ORCPT ); Tue, 7 Jul 2015 16:22:34 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:51192 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932589AbbGGUU6 (ORCPT ); Tue, 7 Jul 2015 16:20:58 -0400 From: Yinghai Lu To: Kees Cook , "H. Peter Anvin" , Baoquan He Cc: linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH 25/42] x86, boot: print compression suffix in decompress stage Date: Tue, 7 Jul 2015 13:20:11 -0700 Message-Id: <1436300428-21163-26-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1436300428-21163-1-git-send-email-yinghai@kernel.org> References: <1436300428-21163-1-git-send-email-yinghai@kernel.org> X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Yinghai Lu --- arch/x86/boot/compressed/misc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index a428c03..9266f78 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c @@ -120,26 +120,32 @@ static int lines, cols; #ifdef CONFIG_KERNEL_GZIP #include "../../../../lib/decompress_inflate.c" +static char *suffix_str = "gz"; #endif #ifdef CONFIG_KERNEL_BZIP2 #include "../../../../lib/decompress_bunzip2.c" +static char *suffix_str = "bz2"; #endif #ifdef CONFIG_KERNEL_LZMA #include "../../../../lib/decompress_unlzma.c" +static char *suffix_str = "lzma"; #endif #ifdef CONFIG_KERNEL_XZ #include "../../../../lib/decompress_unxz.c" +static char *suffix_str = "xz"; #endif #ifdef CONFIG_KERNEL_LZO #include "../../../../lib/decompress_unlzo.c" +static char *suffix_str = "lzo"; #endif #ifdef CONFIG_KERNEL_LZ4 #include "../../../../lib/decompress_unlz4.c" +static char *suffix_str = "lz4"; #endif static void scroll(void) @@ -486,6 +492,8 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap, (unsigned long)input_data, (unsigned long)input_data + input_len - 1); debug_putstr("\nDecompressing Linux... "); + debug_putstr(suffix_str); + debug_putstr("... "); decompress(input_data, input_len, NULL, NULL, output, NULL, error); parse_elf(output); handle_relocations(output, output_len, virt_offset); -- 1.8.4.5