diff options
author | Mark Brown <broonie@kernel.org> | 2016-02-05 19:28:22 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-02-05 19:28:22 +0000 |
commit | cd6f5814252060db2d38f57c602db33696c549c0 (patch) | |
tree | 0bcf23a07f1316cb57f0127e5b1622fea59c3e8e /arch/x86/include/asm/boot.h | |
parent | d235b7b42ab59e2e616082a0735b3bcc76685c7b (diff) | |
parent | e14ca734b547e3187713441909897aefdf4e4016 (diff) |
Merge tag 'v3.10.96' into linux-linaro-lsk-v3.10lsk-v3.10-16.02
This is the 3.10.96 stable release
Diffstat (limited to 'arch/x86/include/asm/boot.h')
-rw-r--r-- | arch/x86/include/asm/boot.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h index 4fa687a47a62..6b8d6e8cd449 100644 --- a/arch/x86/include/asm/boot.h +++ b/arch/x86/include/asm/boot.h @@ -27,7 +27,7 @@ #define BOOT_HEAP_SIZE 0x400000 #else /* !CONFIG_KERNEL_BZIP2 */ -#define BOOT_HEAP_SIZE 0x8000 +#define BOOT_HEAP_SIZE 0x10000 #endif /* !CONFIG_KERNEL_BZIP2 */ |