On Thu, 24 Jul 2014, Borislav Petkov wrote: > On Wed, Jul 23, 2014 at 05:10:47PM -0300, Henrique de Moraes Holschuh wrote: > > Rename apply_microcode() in microcode/intel.c to apply_microcode_intel(), > > and declare it as extern in the asm/microcode_intel.h header. > > > > This is a cosmetic fix to silence a warning issued by sparse. It brings > > the microcode/intel.c driver in line with what microcode/amd.c is doing. > > > > Signed-off-by: Henrique de Moraes Holschuh <[email protected]> > > --- > > arch/x86/include/asm/microcode_intel.h | 1 + > > arch/x86/kernel/cpu/microcode/intel.c | 4 ++-- > > 2 files changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/arch/x86/include/asm/microcode_intel.h > > b/arch/x86/include/asm/microcode_intel.h > > index 9067166..2bdbc6b 100644 > > --- a/arch/x86/include/asm/microcode_intel.h > > +++ b/arch/x86/include/asm/microcode_intel.h > > @@ -62,6 +62,7 @@ extern int microcode_sanity_check(void *mc, int > > print_err); > > extern int get_matching_sig(unsigned int csig, int cpf, void *mc, int rev); > > extern int > > update_match_revision(struct microcode_header_intel *mc_header, int rev); > > +extern int apply_microcode_intel(int cpu); > > > > #ifdef CONFIG_MICROCODE_INTEL_EARLY > > extern void __init load_ucode_intel_bsp(void); > > diff --git a/arch/x86/kernel/cpu/microcode/intel.c > > b/arch/x86/kernel/cpu/microcode/intel.c > > index a276fa7..a51cb19 100644 > > --- a/arch/x86/kernel/cpu/microcode/intel.c > > +++ b/arch/x86/kernel/cpu/microcode/intel.c > > @@ -127,7 +127,7 @@ static int get_matching_mc(struct microcode_intel > > *mc_intel, int cpu) > > return get_matching_microcode(csig, cpf, mc_intel, crev); > > } > > > > -int apply_microcode(int cpu) > > +int apply_microcode_intel(int cpu) > > Actually, this function should be static. The AMD counterpart is used in > amd_early.c too, that's why it is exported there, unlike here. > > The "_intel" suffix is ok.
Ok, I will respin this patch. -- "One disk to rule them all, One disk to find them. One disk to bring them all and in the darkness grind them. In the Land of Redmond where the shadows lie." -- The Silicon Valley Tarot Henrique Holschuh -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
