lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 123/390] x86/cpu: Include the header of init_ia32_feat_ctl()s prototype
    Date
    From: Luciano Leão <lucianorsleao@gmail.com>

    [ 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@gmail.com>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Reviewed-by: Nícolas F. R. A. Prado <n@nfraprado.net>
    Link: https://lore.kernel.org/r/20220922200053.1357470-1-lucianorsleao@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/kernel/cpu/feat_ctl.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/x86/kernel/cpu/feat_ctl.c b/arch/x86/kernel/cpu/feat_ctl.c
    index 29a3bedabd06..d7541851288e 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
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-24 15:35    [W:2.843 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site