]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
x86/microcode/intel: Get rid of last arg to load_ucode_intel_bsp()
authorBorislav Petkov <bp@suse.de>
Mon, 9 Feb 2015 16:40:03 +0000 (17:40 +0100)
committerBorislav Petkov <bp@suse.de>
Mon, 2 Mar 2015 19:31:48 +0000 (20:31 +0100)
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>
arch/x86/kernel/cpu/microcode/intel_early.c

index 95516006958d00f92d1f8813a11da7a6c6cc6944..ed30bc77dd38587e90a7e19bfbf3bfb9bd14b3b8 100644 (file)
@@ -722,21 +722,21 @@ 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
@@ -744,7 +744,6 @@ 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;
 
@@ -757,7 +756,7 @@ 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;
@@ -765,8 +764,7 @@ load_ucode_intel_bsp(void)
        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
 }