Patch "x86/cpu: Include the header of init_ia32_feat_ctl()'s prototype" has been added to the 5.15-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    x86/cpu: Include the header of init_ia32_feat_ctl()'s prototype

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     x86-cpu-include-the-header-of-init_ia32_feat_ctl-s-p.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit bb686bdeae033b8b79df46732114b6107f89c8db
Author: Luciano Leão <lucianorsleao@xxxxxxxxx>
Date:   Thu Sep 22 17:00:54 2022 -0300

    x86/cpu: Include the header of init_ia32_feat_ctl()'s prototype
    
    [ Upstream commit 30ea703a38ef76ca119673cd8bdd05c6e068e2ac ]
    
    Include the header containing the prototype of init_ia32_feat_ctl(),
    solving the following warning:
    
      $ make W=1 arch/x86/kernel/cpu/feat_ctl.o
      arch/x86/kernel/cpu/feat_ctl.c:112:6: warning: no previous prototype for ‘init_ia32_feat_ctl’ [-Wmissing-prototypes]
        112 | void init_ia32_feat_ctl(struct cpuinfo_x86 *c)
    
    This warning appeared after commit
    
      5d5103595e9e5 ("x86/cpu: Reinitialize IA32_FEAT_CTL MSR on BSP during wakeup")
    
    had moved the function init_ia32_feat_ctl()'s prototype from
    arch/x86/kernel/cpu/cpu.h to arch/x86/include/asm/cpu.h.
    
    Note that, before the commit mentioned above, the header include "cpu.h"
    (arch/x86/kernel/cpu/cpu.h) was added by commit
    
      0e79ad863df43 ("x86/cpu: Fix a -Wmissing-prototypes warning for init_ia32_feat_ctl()")
    
    solely to fix init_ia32_feat_ctl()'s missing prototype. So, the header
    include "cpu.h" is no longer necessary.
    
      [ bp: Massage commit message. ]
    
    Fixes: 5d5103595e9e5 ("x86/cpu: Reinitialize IA32_FEAT_CTL MSR on BSP during wakeup")
    Signed-off-by: Luciano Leão <lucianorsleao@xxxxxxxxx>
    Signed-off-by: Borislav Petkov <bp@xxxxxxx>
    Reviewed-by: Nícolas F. R. A. Prado <n@xxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20220922200053.1357470-1-lucianorsleao@xxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/x86/kernel/cpu/feat_ctl.c b/arch/x86/kernel/cpu/feat_ctl.c
index da696eb4821a..e77032c5f85c 100644
--- a/arch/x86/kernel/cpu/feat_ctl.c
+++ b/arch/x86/kernel/cpu/feat_ctl.c
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <linux/tboot.h>
 
+#include <asm/cpu.h>
 #include <asm/cpufeature.h>
 #include <asm/msr-index.h>
 #include <asm/processor.h>
 #include <asm/vmx.h>
-#include "cpu.h"
 
 #undef pr_fmt
 #define pr_fmt(fmt)	"x86/cpu: " fmt