diff options
Diffstat (limited to 'arch/x86/boot/compressed/misc.c')
-rw-r--r-- | arch/x86/boot/compressed/misc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index a950864a64da..a107b935e22f 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c | |||
@@ -377,6 +377,9 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap, | |||
377 | 377 | ||
378 | real_mode = rmode; | 378 | real_mode = rmode; |
379 | 379 | ||
380 | /* Clear it for solely in-kernel use */ | ||
381 | real_mode->hdr.loadflags &= ~KASLR_FLAG; | ||
382 | |||
380 | sanitize_boot_params(real_mode); | 383 | sanitize_boot_params(real_mode); |
381 | 384 | ||
382 | if (real_mode->screen_info.orig_video_mode == 7) { | 385 | if (real_mode->screen_info.orig_video_mode == 7) { |
@@ -401,7 +404,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap, | |||
401 | * the entire decompressed kernel plus relocation table, or the | 404 | * the entire decompressed kernel plus relocation table, or the |
402 | * entire decompressed kernel plus .bss and .brk sections. | 405 | * entire decompressed kernel plus .bss and .brk sections. |
403 | */ | 406 | */ |
404 | output = choose_kernel_location(input_data, input_len, output, | 407 | output = choose_kernel_location(real_mode, input_data, input_len, output, |
405 | output_len > run_size ? output_len | 408 | output_len > run_size ? output_len |
406 | : run_size); | 409 | : run_size); |
407 | 410 | ||