p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

x86/microcode/intel: Get rid of last arg to load_ucode_intel_bsp() 

Allocate it on the helper's _load_ucode_intel_bsp() stack instead and do
not hand it down.

Signed-off-by: Borislav Petkov <bp@suse.de>
This commit is contained in:
Borislav Petkov 2015-02-09 17:40:03 +01:00
parent f9524e6f54
commit 2d48bb9b6e
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/x86/kernel/cpu/microcode/intel_early.c
View File

@ -722,21 +722,21 @@ static void __init
_load_ucode_intel_bsp(struct mc_saved_data *mc_saved_data, _load_ucode_intel_bsp(struct mc_saved_data *mc_saved_data,
unsigned long *mc_saved_in_initrd, unsigned long *mc_saved_in_initrd,
unsigned long initrd_start_early, unsigned long initrd_start_early,
unsigned long initrd_end_early, unsigned long initrd_end_early)
struct ucode_cpu_info *uci)
{ {
struct ucode_cpu_info uci;
enum ucode_state ret; enum ucode_state ret;
collect_cpu_info_early(uci); collect_cpu_info_early(&uci);
scan_microcode(initrd_start_early, initrd_end_early, mc_saved_data, scan_microcode(initrd_start_early, initrd_end_early, mc_saved_data,
mc_saved_in_initrd, uci); mc_saved_in_initrd, &uci);
ret = load_microcode(mc_saved_data, mc_saved_in_initrd, ret = load_microcode(mc_saved_data, mc_saved_in_initrd,
initrd_start_early, uci); initrd_start_early, &uci);
if (ret != UCODE_OK) if (ret != UCODE_OK)
return; return;
apply_microcode_early(uci, true); apply_microcode_early(&uci, true);
} }
void __init void __init
@ -744,7 +744,6 @@ load_ucode_intel_bsp(void)
{ {
u64 ramdisk_image, ramdisk_size; u64 ramdisk_image, ramdisk_size;
unsigned long initrd_start_early, initrd_end_early; unsigned long initrd_start_early, initrd_end_early;
struct ucode_cpu_info uci;
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
struct boot_params *boot_params_p; struct boot_params *boot_params_p;
@ -757,7 +756,7 @@ load_ucode_intel_bsp(void)
_load_ucode_intel_bsp( _load_ucode_intel_bsp(
(struct mc_saved_data *)__pa_nodebug(&mc_saved_data), (struct mc_saved_data *)__pa_nodebug(&mc_saved_data),
(unsigned long *)__pa_nodebug(&mc_saved_in_initrd), (unsigned long *)__pa_nodebug(&mc_saved_in_initrd),
initrd_start_early, initrd_end_early, &uci); initrd_start_early, initrd_end_early);
#else #else
ramdisk_image = boot_params.hdr.ramdisk_image; ramdisk_image = boot_params.hdr.ramdisk_image;
ramdisk_size = boot_params.hdr.ramdisk_size; ramdisk_size = boot_params.hdr.ramdisk_size;
@ -765,8 +764,7 @@ load_ucode_intel_bsp(void)
initrd_end_early = initrd_start_early + ramdisk_size; initrd_end_early = initrd_start_early + ramdisk_size;
_load_ucode_intel_bsp(&mc_saved_data, mc_saved_in_initrd, _load_ucode_intel_bsp(&mc_saved_data, mc_saved_in_initrd,
initrd_start_early, initrd_end_early, initrd_start_early, initrd_end_early);
&uci);
#endif #endif
} }