From: Greg Kroah-Hartman Date: Wed, 19 May 2021 14:26:23 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v4.4.269~40 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5140b3aee2a0cdbe4b08d5590d73242c6339aa4c;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: x86-msr-fix-wr-rdmsr_safe_regs_on_cpu-prototypes.patch --- diff --git a/queue-4.14/series b/queue-4.14/series index f33aafcf130..ce2c9e280c8 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -299,3 +299,4 @@ rdma-i40iw-avoid-panic-when-reading-back-the-irq-affinity-hint.patch kobject_uevent-remove-warning-in-init_uevent_argv.patch netfilter-conntrack-make-global-sysctls-readonly-in-non-init-netns.patch clk-exynos7-mark-aclk_fsys1_200-as-critical.patch +x86-msr-fix-wr-rdmsr_safe_regs_on_cpu-prototypes.patch diff --git a/queue-4.19/series b/queue-4.19/series index 882c4621edf..2ade86806cd 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -392,3 +392,4 @@ kobject_uevent-remove-warning-in-init_uevent_argv.patch netfilter-conntrack-make-global-sysctls-readonly-in-non-init-netns.patch clk-exynos7-mark-aclk_fsys1_200-as-critical.patch nvme-do-not-try-to-reconfigure-apst-when-the-controller-is-not-live.patch +x86-msr-fix-wr-rdmsr_safe_regs_on_cpu-prototypes.patch diff --git a/queue-4.4/series b/queue-4.4/series index 3cee2fff185..481227719f6 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -174,3 +174,4 @@ mips-avoid-handcoded-divu-in-__div64_32-altogether.patch thermal-core-fair-share-lock-the-thermal-zone-while-looping-over-instances.patch dm-ioctl-fix-out-of-bounds-array-access-when-no-devices.patch kobject_uevent-remove-warning-in-init_uevent_argv.patch +x86-msr-fix-wr-rdmsr_safe_regs_on_cpu-prototypes.patch diff --git a/queue-4.4/x86-msr-fix-wr-rdmsr_safe_regs_on_cpu-prototypes.patch b/queue-4.4/x86-msr-fix-wr-rdmsr_safe_regs_on_cpu-prototypes.patch new file mode 100644 index 00000000000..e8a23934211 --- /dev/null +++ b/queue-4.4/x86-msr-fix-wr-rdmsr_safe_regs_on_cpu-prototypes.patch @@ -0,0 +1,51 @@ +From 396a66aa1172ef2b78c21651f59b40b87b2e5e1e Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Mon, 22 Mar 2021 17:45:36 +0100 +Subject: x86/msr: Fix wr/rdmsr_safe_regs_on_cpu() prototypes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Arnd Bergmann + +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 +Signed-off-by: Ingo Molnar +Link: https://lore.kernel.org/r/20210322164541.912261-1-arnd@kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -239,7 +239,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; +@@ -252,7 +252,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; diff --git a/queue-4.9/series b/queue-4.9/series index 0b0cdd16c39..f609739d4c9 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -221,3 +221,4 @@ dm-ioctl-fix-out-of-bounds-array-access-when-no-devices.patch kobject_uevent-remove-warning-in-init_uevent_argv.patch netfilter-conntrack-make-global-sysctls-readonly-in-non-init-netns.patch clk-exynos7-mark-aclk_fsys1_200-as-critical.patch +x86-msr-fix-wr-rdmsr_safe_regs_on_cpu-prototypes.patch diff --git a/queue-5.10/series b/queue-5.10/series new file mode 100644 index 00000000000..62e696f2277 --- /dev/null +++ b/queue-5.10/series @@ -0,0 +1,3 @@ +x86-msr-fix-wr-rdmsr_safe_regs_on_cpu-prototypes.patch +drm-i915-display-fix-compiler-warning-about-array-overrun.patch +airo-work-around-stack-usage-warning.patch diff --git a/queue-5.12/series b/queue-5.12/series new file mode 100644 index 00000000000..62e696f2277 --- /dev/null +++ b/queue-5.12/series @@ -0,0 +1,3 @@ +x86-msr-fix-wr-rdmsr_safe_regs_on_cpu-prototypes.patch +drm-i915-display-fix-compiler-warning-about-array-overrun.patch +airo-work-around-stack-usage-warning.patch diff --git a/queue-5.4/series b/queue-5.4/series new file mode 100644 index 00000000000..6f43f95d417 --- /dev/null +++ b/queue-5.4/series @@ -0,0 +1 @@ +x86-msr-fix-wr-rdmsr_safe_regs_on_cpu-prototypes.patch