lkml.org 
[lkml]   [2021]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 01/45] x86/msr: Fix wr/rdmsr_safe_regs_on_cpu() prototypes
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    commit 396a66aa1172ef2b78c21651f59b40b87b2e5e1e upstream.

    gcc-11 warns about mismatched prototypes here:

    arch/x86/lib/msr-smp.c:255:51: error: argument 2 of type ‘u32 *’ {aka ‘unsigned int *’} declared as a pointer [-Werror=array-parameter=]
    255 | int rdmsr_safe_regs_on_cpu(unsigned int cpu, u32 *regs)
    | ~~~~~^~~~
    arch/x86/include/asm/msr.h:347:50: note: previously declared as an array ‘u32[8]’ {aka ‘unsigned int[8]’}

    GCC is right here - fix up the types.

    [ mingo: Twiddled the changelog. ]

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Link: https://lore.kernel.org/r/20210322164541.912261-1-arnd@kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/x86/lib/msr-smp.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/arch/x86/lib/msr-smp.c
    +++ b/arch/x86/lib/msr-smp.c
    @@ -252,7 +252,7 @@ static void __wrmsr_safe_regs_on_cpu(voi
    rv->err = wrmsr_safe_regs(rv->regs);
    }

    -int rdmsr_safe_regs_on_cpu(unsigned int cpu, u32 *regs)
    +int rdmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8])
    {
    int err;
    struct msr_regs_info rv;
    @@ -265,7 +265,7 @@ int rdmsr_safe_regs_on_cpu(unsigned int
    }
    EXPORT_SYMBOL(rdmsr_safe_regs_on_cpu);

    -int wrmsr_safe_regs_on_cpu(unsigned int cpu, u32 *regs)
    +int wrmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8])
    {
    int err;
    struct msr_regs_info rv;

    \
     
     \ /
      Last update: 2021-05-20 11:24    [W:4.304 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site