Skip to content

Commit

Permalink
x86/microcode/intel: Get rid of last arg to load_ucode_intel_bsp()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Borislav Petkov committed Mar 2, 2015
1 parent f9524e6 commit 2d48bb9
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions arch/x86/kernel/cpu/microcode/intel_early.c
Original file line number Diff line number Diff line change
Expand Up @@ -722,29 +722,28 @@ static void __init
_load_ucode_intel_bsp(struct mc_saved_data *mc_saved_data,
unsigned long *mc_saved_in_initrd,
unsigned long initrd_start_early,
unsigned long initrd_end_early,
struct ucode_cpu_info *uci)
unsigned long initrd_end_early)
{
struct ucode_cpu_info uci;
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,
mc_saved_in_initrd, uci);
mc_saved_in_initrd, &uci);

ret = load_microcode(mc_saved_data, mc_saved_in_initrd,
initrd_start_early, uci);
initrd_start_early, &uci);
if (ret != UCODE_OK)
return;

apply_microcode_early(uci, true);
apply_microcode_early(&uci, true);
}

void __init
load_ucode_intel_bsp(void)
{
u64 ramdisk_image, ramdisk_size;
unsigned long initrd_start_early, initrd_end_early;
struct ucode_cpu_info uci;
#ifdef CONFIG_X86_32
struct boot_params *boot_params_p;

Expand All @@ -757,16 +756,15 @@ load_ucode_intel_bsp(void)
_load_ucode_intel_bsp(
(struct mc_saved_data *)__pa_nodebug(&mc_saved_data),
(unsigned long *)__pa_nodebug(&mc_saved_in_initrd),
initrd_start_early, initrd_end_early, &uci);
initrd_start_early, initrd_end_early);
#else
ramdisk_image = boot_params.hdr.ramdisk_image;
ramdisk_size = boot_params.hdr.ramdisk_size;
initrd_start_early = ramdisk_image + PAGE_OFFSET;
initrd_end_early = initrd_start_early + ramdisk_size;

_load_ucode_intel_bsp(&mc_saved_data, mc_saved_in_initrd,
initrd_start_early, initrd_end_early,
&uci);
initrd_start_early, initrd_end_early);
#endif
}

Expand Down

0 comments on commit 2d48bb9

Please sign in to comment.