Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / arch / x86 / kernel / microcode_intel_early.c

diff --git a/arch/x86/kernel/microcode_intel_early.c b/arch/x86/kernel/microcode_intel_early.c
index 2e9e12871c2b51a9fe48068369f8dd4346a4db51..dabef95506f39e23c58fa74a177736eccd62ccb6 100644 (file)
--- a/arch/x86/kernel/microcode_intel_early.c
+++ b/arch/x86/kernel/microcode_intel_early.c
@@ -529,7 +529,7 @@ int save_mc_for_early(u8 *mc)
         */
        ret = save_microcode(&mc_saved_data, mc_saved_tmp, mc_saved_count);
        if (ret) {
-               pr_err("Can not save microcode patch.\n");
+               pr_err("Cannot save microcode patch.\n");
                goto out;
        }
 
@@ -699,7 +699,7 @@ static int __cpuinit apply_microcode_early(struct mc_saved_data *mc_saved_data,
  * This function converts microcode patch offsets previously stored in
  * mc_saved_in_initrd to pointers and stores the pointers in mc_saved_data.
  */
-int __init save_microcode_in_initrd(void)
+int __init save_microcode_in_initrd_intel(void)
 {
        unsigned int count = mc_saved_data.mc_saved_count;
        struct microcode_intel *mc_saved[MAX_UCODE_COUNT];
@@ -711,7 +711,7 @@ int __init save_microcode_in_initrd(void)
        microcode_pointer(mc_saved, mc_saved_in_initrd, initrd_start, count);
        ret = save_microcode(&mc_saved_data, mc_saved, count);
        if (ret)
-               pr_err("Can not save microcod patches from initrd");
+               pr_err("Cannot save microcode patches from initrd.\n");
 
        show_saved_mc();