Merge tag 'x86-boot-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 boot updates from Ingo Molnar: "The main change in this cycle was to add support for ZSTD-compressed kernel and initrd images. ZSTD has a very fast decompressor, yet it compresses better than gzip" * tag 'x86-boot-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: Documentation: dontdiff: Add zstd compressed files .gitignore: Add ZSTD-compressed files x86: Add support for ZSTD compressed kernel x86: Bump ZO_z_extra_bytes margin for zstd usr: Add support for zstd compressed initramfs init: Add support for zstd compressed kernel lib: Add zstd support to decompress lib: Prepare zstd for preboot environment, improve performance
This commit is contained in:
@@ -24,9 +24,16 @@
|
||||
# error "Invalid value for CONFIG_PHYSICAL_ALIGN"
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_KERNEL_BZIP2
|
||||
#if defined(CONFIG_KERNEL_BZIP2)
|
||||
# define BOOT_HEAP_SIZE 0x400000
|
||||
#else /* !CONFIG_KERNEL_BZIP2 */
|
||||
#elif defined(CONFIG_KERNEL_ZSTD)
|
||||
/*
|
||||
* Zstd needs to allocate the ZSTD_DCtx in order to decompress the kernel.
|
||||
* The ZSTD_DCtx is ~160KB, so set the heap size to 192KB because it is a
|
||||
* round number and to allow some slack.
|
||||
*/
|
||||
# define BOOT_HEAP_SIZE 0x30000
|
||||
#else
|
||||
# define BOOT_HEAP_SIZE 0x10000
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user