xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/msr: Fix wr/rdmsr_safe_regs_on_cpu() prototypes

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2021-03-22 17:45:36 +01:00
committed by Greg Kroah-Hartman
parent 689e89aee5
commit ee387de3ca
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/lib/msr-smp.c
View File

@@ -253,7 +253,7 @@ static void __wrmsr_safe_regs_on_cpu(void *info)
rv->err = wrmsr_safe_regs(rv->regs); 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; int err;
struct msr_regs_info rv; struct msr_regs_info rv;
@@ -266,7 +266,7 @@ int rdmsr_safe_regs_on_cpu(unsigned int cpu, u32 *regs)
} }
EXPORT_SYMBOL(rdmsr_safe_regs_on_cpu); 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; int err;
struct msr_regs_info rv; struct msr_regs_info rv;