diff options
author | Igor Opaniuk <igor.opaniuk@toradex.com> | 2020-11-17 11:31:57 +0200 |
---|---|---|
committer | Igor Opaniuk <igor.opaniuk@toradex.com> | 2020-11-17 11:31:57 +0200 |
commit | 664411bde9c033778f85f9ae3a74351406642f6a (patch) | |
tree | 9e981b04895ab1b0fe6cbe6b5a89af256632fd80 /arch/x86/kernel/kexec-bzimage64.c | |
parent | 14655070177685c8b390e1caec15da757228be1a (diff) | |
parent | 2544d06afd8d060f35b159809274e4b7477e63e8 (diff) |
Merge tag 'v5.4.77' into toradex_5.4.y
This is the 5.4.77 stable release
Diffstat (limited to 'arch/x86/kernel/kexec-bzimage64.c')
-rw-r--r-- | arch/x86/kernel/kexec-bzimage64.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c index d2f4e706a428..b8b3b84308ed 100644 --- a/arch/x86/kernel/kexec-bzimage64.c +++ b/arch/x86/kernel/kexec-bzimage64.c @@ -210,8 +210,7 @@ setup_boot_parameters(struct kimage *image, struct boot_params *params, params->hdr.hardware_subarch = boot_params.hdr.hardware_subarch; /* Copying screen_info will do? */ - memcpy(¶ms->screen_info, &boot_params.screen_info, - sizeof(struct screen_info)); + memcpy(¶ms->screen_info, &screen_info, sizeof(struct screen_info)); /* Fill in memsize later */ params->screen_info.ext_mem_k = 0; |