From patchwork Thu May 20 09:24:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 443232 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2196965jac; Thu, 20 May 2021 04:25:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5rUXPe9AsZ0J1wJG4joxfwMC+A87bZhg5u0/IfBHMOKECiRtE/urh4/Be8XXxZKU5doSQ X-Received: by 2002:a6b:3c1a:: with SMTP id k26mr4993787iob.113.1621509907520; Thu, 20 May 2021 04:25:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621509907; cv=none; d=google.com; s=arc-20160816; b=GV+jfbmvcZuV+I26va1/fM8VGKH+SPKz9owsupX95SwUTUJWgeAVy59RV9eZiy15v6 13NEB8Jsdu32toxsAzAxahKBWlgcnsbHcImhr/yQEiSmDBsyf2IcsGbqGQVD79rcOlNm LsCylb6mmNRXpW+BSsEky/XuZvbnKybmfhpFbFS6ONlNSJCzuo+BOka7iOUqr0sAlJrf QL8tQEJKtiD6mxpaxcindjVweT4I7bs2gtDh2MOeA2HBN4bjvsiGnCCj1QEcdVYYCfeN M109jAfofsT4MTpgIyTyHTITtce0KyLf/7D7NGZgAlwrhEPq9ymB6gNUfZ4NKOiS3gy1 n/rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MkK1Pwz5if5Lazfa9egXrYtYWfUp6EStyHoYhNzK6Qc=; b=mmKgpv/CTlXxmsdabmz7qAc5TcuIXPaTpqgW986Hpl0dt20VNARwNW+3lBWRQl58vN K083B710kMKbiYOHUzitIXIvqcp1fe6EfcIlTNrj87nn/VUUCABTJPRhD4iSFNhRb3VS edm5UoAeO8WRwXBTz/AXoSVM9PhO3X7R31E1eGSNchWVZUrfqhwDkxzDTCXvOQ6ZQ2mJ gDtC8LQaG6Nypb+9fDp7GK635kkoVcMw/TEsX1LvknKSzWhYndLsCBhpndLCWOBTkdMR 6EZj55REtmzdYjVQO5YU0sIcD+bw+5E3BAByf2bFWvkuqWbA0bqbr3r/OKZ4ElbKqrXa zYww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IeVnKRT7; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b11si1937604iok.1.2021.05.20.04.25.05; Thu, 20 May 2021 04:25:07 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IeVnKRT7; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239814AbhETL0S (ORCPT + 12 others); Thu, 20 May 2021 07:26:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:45560 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241107AbhETLXt (ORCPT ); Thu, 20 May 2021 07:23:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 55A4C61D9B; Thu, 20 May 2021 10:12:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621505533; bh=DxXPoU4nmCj8bRLhnv8Q1DKdGo+gIGPorYOkRXJSt0M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IeVnKRT7LntK/GqMWQGY3bJDKLEqQY3ndT3f21OPBTGbFJIrv4MkVuPEBMDVYoB99 Vmw75I4P1SKWWo8XBCiFDjPpylNWxIzFAnK/x9jWn4hpqwTYxXeEREZNMRaOyZCw3p Hd1VoNVTVNhSpR9SpyMdlMAGq51m7OSciZSDEZeA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Ingo Molnar Subject: [PATCH 4.4 177/190] x86/msr: Fix wr/rdmsr_safe_regs_on_cpu() prototypes Date: Thu, 20 May 2021 11:24:01 +0200 Message-Id: <20210520092108.021000124@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092102.149300807@linuxfoundation.org> References: <20210520092102.149300807@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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;