Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp608630pxj; Thu, 20 May 2021 17:44:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEE57uG8FEIsNXZfpv42mioFwEx+wm+PHOGXhr8UmFnLlJf1NxhheLtGN3vkYvBFYMKswO X-Received: by 2002:a17:906:d922:: with SMTP id rn2mr7301788ejb.469.1621557885352; Thu, 20 May 2021 17:44:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621557885; cv=none; d=google.com; s=arc-20160816; b=rctAxohunAgIFvkRzBsvoXp6NzaG67QGwKPLBdOP5UWhOvlKyATO3UT3ulEjAl81Gb 4J5ptsd0KJA9S3DGKkqM+m0jj1fi5Ls5FrGD9Hlmfy5fQRs7/BYdhmFnbwq5uCRuhdnR s0J6uv/CG7eEibiyAuRi/KGvIUZgfYPFVMO5xiDAzfHte/la8amkBWnMniO1O66RyuS4 R47XF1S6fv5hfhf1Y171SFInd+WNOvBtiGrCNZ/l99XUnT5MYoUQ3yQ316ZfFpyQy0pl P8qCtyUK+Sp3ydNkLt2VBqbjn0udzExKw+vvlv20YYxDuUbOr/qLUgmPX+zFgilES2am 6AwQ== 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=N9OFly3wOz9fN4UroEUaefOQUbqqMISoj81s/6AI0Y0l7JLWG9SBhA4YDVNnP2c9py kWJqg2wqXuv186DbfRXzVMz6jScY8BFImiOzSSksNIt5WBr9t7BWdimHKTQ8GujY310d 7ToA+i/AHVAmTwz/MlDcl4GrN5N06nJQlpXU/onU7BX8el+KNnODxWL8qQtelkw5d6hf rht8JpXbMoUMeOcRo0GnVHFEoBPoTwx9keQSQ2+WANI/90q0QUd4lDFKGwsZ3O6MFgmB OxTVJqkRMLZ2T/XNCzjvHn7AtiAVHKYfuq9NwCfclxSvafUJeQ4b9hpZJkDwUslWl3BM JjBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kTKjI11c; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 d17si1567226edv.595.2021.05.20.17.44.21; Thu, 20 May 2021 17:44:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=kTKjI11c; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S241345AbhETL1F (ORCPT + 99 others); Thu, 20 May 2021 07:27:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:37896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235618AbhETLHN (ORCPT ); Thu, 20 May 2021 07:07:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F1D9461D26; Thu, 20 May 2021 10:05:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621505152; bh=DxXPoU4nmCj8bRLhnv8Q1DKdGo+gIGPorYOkRXJSt0M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kTKjI11cgJfi3l/rn1dHCnZpIW+2RtQ4ySrBULjsD9K7rXKOvpv9Lf/kNGdZZiBGe IjAYEV0gD2lpZniFbB+YMq7pG2gHiEYDYULRHgXuBPDv3w7vyohIR3G1X4qRwKEj2p onX7zGtK3sz/jRz5+1uMru1OKKbLQ/0fS+d45QfU= 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.9 224/240] x86/msr: Fix wr/rdmsr_safe_regs_on_cpu() prototypes Date: Thu, 20 May 2021 11:23:36 +0200 Message-Id: <20210520092116.235551046@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092108.587553970@linuxfoundation.org> References: <20210520092108.587553970@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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;