aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2015-02-09 11:40:03 -0500
committerBorislav Petkov <bp@suse.de>2015-03-02 14:31:48 -0500
commit2d48bb9b6ec6fb0f28e5135fd080edc23152ae45 (patch)
treecbfe5d1005736d5116e58842db6dcea50cc7fc4c /arch/x86
parentf9524e6f5447277e238b419afc3d0712941fa2a5 (diff)
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/cpu/microcode/intel_early.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/arch/x86/kernel/cpu/microcode/intel_early.c b/arch/x86/kernel/cpu/microcode/intel_early.c
index 95516006958d..ed30bc77dd38 100644
--- a/arch/x86/kernel/cpu/microcode/intel_early.c
+++ b/arch/x86/kernel/cpu/microcode/intel_early.c
@@ -722,21 +722,21 @@ static void __init
722_load_ucode_intel_bsp(struct mc_saved_data *mc_saved_data, 722_load_ucode_intel_bsp(struct mc_saved_data *mc_saved_data,
723 unsigned long *mc_saved_in_initrd, 723 unsigned long *mc_saved_in_initrd,
724 unsigned long initrd_start_early, 724 unsigned long initrd_start_early,
725 unsigned long initrd_end_early, 725 unsigned long initrd_end_early)
726 struct ucode_cpu_info *uci)
727{ 726{
727 struct ucode_cpu_info uci;
728 enum ucode_state ret; 728 enum ucode_state ret;
729 729
730 collect_cpu_info_early(uci); 730 collect_cpu_info_early(&uci);
731 scan_microcode(initrd_start_early, initrd_end_early, mc_saved_data, 731 scan_microcode(initrd_start_early, initrd_end_early, mc_saved_data,
732 mc_saved_in_initrd, uci); 732 mc_saved_in_initrd, &uci);
733 733
734 ret = load_microcode(mc_saved_data, mc_saved_in_initrd, 734 ret = load_microcode(mc_saved_data, mc_saved_in_initrd,
735 initrd_start_early, uci); 735 initrd_start_early, &uci);
736 if (ret != UCODE_OK) 736 if (ret != UCODE_OK)
737 return; 737 return;
738 738
739 apply_microcode_early(uci, true); 739 apply_microcode_early(&uci, true);
740} 740}
741 741
742void __init 742void __init
@@ -744,7 +744,6 @@ load_ucode_intel_bsp(void)
744{ 744{
745 u64 ramdisk_image, ramdisk_size; 745 u64 ramdisk_image, ramdisk_size;
746 unsigned long initrd_start_early, initrd_end_early; 746 unsigned long initrd_start_early, initrd_end_early;
747 struct ucode_cpu_info uci;
748#ifdef CONFIG_X86_32 747#ifdef CONFIG_X86_32
749 struct boot_params *boot_params_p; 748 struct boot_params *boot_params_p;
750 749
@@ -757,7 +756,7 @@ load_ucode_intel_bsp(void)
757 _load_ucode_intel_bsp( 756 _load_ucode_intel_bsp(
758 (struct mc_saved_data *)__pa_nodebug(&mc_saved_data), 757 (struct mc_saved_data *)__pa_nodebug(&mc_saved_data),
759 (unsigned long *)__pa_nodebug(&mc_saved_in_initrd), 758 (unsigned long *)__pa_nodebug(&mc_saved_in_initrd),
760 initrd_start_early, initrd_end_early, &uci); 759 initrd_start_early, initrd_end_early);
761#else 760#else
762 ramdisk_image = boot_params.hdr.ramdisk_image; 761 ramdisk_image = boot_params.hdr.ramdisk_image;
763 ramdisk_size = boot_params.hdr.ramdisk_size; 762 ramdisk_size = boot_params.hdr.ramdisk_size;
@@ -765,8 +764,7 @@ load_ucode_intel_bsp(void)
765 initrd_end_early = initrd_start_early + ramdisk_size; 764 initrd_end_early = initrd_start_early + ramdisk_size;
766 765
767 _load_ucode_intel_bsp(&mc_saved_data, mc_saved_in_initrd, 766 _load_ucode_intel_bsp(&mc_saved_data, mc_saved_in_initrd,
768 initrd_start_early, initrd_end_early, 767 initrd_start_early, initrd_end_early);
769 &uci);
770#endif 768#endif
771} 769}
772 770