From patchwork Thu May 20 09:23:14 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: 443213 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2164686jac; Thu, 20 May 2021 03:42:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxO7x7Xgzlwxzw3rYvInJaCfjHLqpQLPijem0iYYJZZlZwBtjGtpTQ5yx/P4poCYMeqhvgk X-Received: by 2002:a17:906:46cc:: with SMTP id k12mr3873562ejs.505.1621507326584; Thu, 20 May 2021 03:42:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621507326; cv=none; d=google.com; s=arc-20160816; b=sVdoGaNVB/MC3XkOxkaDEQfDO/HhU1MWq4cBuiz/+1+u+SEGRJeiVKjaDPBvLhyn/s lm5M6HXAzVDvJZjSF206c33fmOcCNp1DOVoxLjitW4DDH+uRgJkSj9fjFPrhjyjTmpI4 LVfCYVCcuZF7QUGQi7wYoTIPv02dWshMnfG2rHDIv8Qw7e7utNb+Z8xkbEP6rBJb5Ek9 YG9PsDrTRRGCd4dawQcapRYJWtZT098uLgwjEYRH+Wq0fe+9YAWLPCG7t6f8FiY29si2 loDJu1Ry1RizYmU9DtbXdl3BNjwhjhJcrcbnq0FaRWxbBnvarSnd9c2Ofi2kYop7WTxt +iZg== 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=+gCOGbBFb/YeVHRiqp/85VzbhhAppHwnbXIfDeIMxmA=; b=ViwrnmohYtK6sQLQquiiGfv1fuM3CDIIcS+xORX46q51GkG9349sOodLSpz97by2qK 8EoOxVpdC6+jl8uytttVTK7GdEEi0HKu1l3oD54U8kJ/WXLcrq/Uo+xzOxUcv8W5wsoc 6VBucU26cYOm6xZkfypnpRGZAA+m3W2HnKO5nwAB/sZJAeAJ+02PJB9jASKagvf2lO4I S/cI7wQ4OG+zDub4U04x2e3oZZo0eCNJ8mWaXSsHdZKhdcVWhDhFb4+ZFNI9eEw0wo9A /QVgSwUPbu6ca+hSGynU5vTyasvlLVVFDkRGBMgURASPis4I3kfOxb+0/l5VDr1cLqy6 Psag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Tsm4g6/d"; 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 l21si1962964edv.573.2021.05.20.03.42.06; Thu, 20 May 2021 03:42:06 -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="Tsm4g6/d"; 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 S237330AbhETKn0 (ORCPT + 12 others); Thu, 20 May 2021 06:43:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:44544 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235872AbhETKlc (ORCPT ); Thu, 20 May 2021 06:41:32 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A6F57613DD; Thu, 20 May 2021 09:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621504563; bh=dmII0+BxKvSBZlr/F7aSI3o7YaafqRk3nKRuiKUXudo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tsm4g6/ddUvB6vfj12THzUgootCXErD4K9CdX9Zl58smjK0yX7pKE8z1kjmC9ISD9 Y8Vf1FGg5NxMpOM+Ad4XbuTMssJgpEw6hi4t4d29Q8ztHt8pyhnIMV9a/YIJwulppW 2C93Vxzute51Hi4dyJfB6DoODNZbDoU3nUWpUL+I= 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.14 302/323] x86/msr: Fix wr/rdmsr_safe_regs_on_cpu() prototypes Date: Thu, 20 May 2021 11:23:14 +0200 Message-Id: <20210520092130.587062558@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092120.115153432@linuxfoundation.org> References: <20210520092120.115153432@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 @@ -240,7 +240,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; @@ -253,7 +253,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;