From patchwork Thu May 20 09:22:43 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: 443200 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2145401jac; Thu, 20 May 2021 03:14:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx789QZRv6kMk9gW9AaT9Qff1NIrOaQn1c/0HdD6F5briLY3tPSnntM5tmnUiQJNo8obsup X-Received: by 2002:a5e:8e4a:: with SMTP id r10mr2445244ioo.96.1621505664636; Thu, 20 May 2021 03:14:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621505664; cv=none; d=google.com; s=arc-20160816; b=nUZB77l4cGooYWOCrauYaQDDUzYLB2W5n3lLtA7KwUv0lwiFiD5+Ddc4HRfK+lVIfz j71L1vYhtvbn6oql2iBtoFjhANfXBJFE4ydiHXmD85njgHQJ3QH/FZyBr+brT43WDCzB kvHDDT4s3J9Wi/2Ls1+q4NuIV03zWRPEl2emR+O7Rt6K6zvwhiXu3wWAjjTieBL4tp+q 3wC8kuyko0+cjCXz9nnDGkcnwzB3gF8Fc+6lDgx7UetXOCucmOuCx8PcMQ6jIxvP/SwT Uz/V3L+ra9YDBQveV+Cm3Qw7vE1yqICJ9Dvp2HruJlDeDB2dvKQCGLRa4IxLM3u89eo8 CxGw== 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=/a9GtL9lhm0i4UZOTaF3fb9giykgla2OPWlTyv0MXds=; b=gArBpDg9mkLSGYue2UeJdeibVUgkPs9taUUliJJKAMFBiRDaQHnnMf3uMEK9BJOVDt WH5OeytxE8fN3LC4ZItvc7EXe5GoLxq7oHI9sKMMpWouZAgG4SDz/u4+yY8pPU+8XiuR gTpiwfHnwSUPBc4OV2UV+TUCD7bY5Hspa5ds9MIYfC+AjoeNC6jnogGztxQ1PNEk/rSt ISnlpUSp+EGHWhJcFmNWn5QzfM/i/gMUTg6+CsKELZvAmSuTvLr+TljwYvxmoV1tPIUH slZhVGtYplaerCNL3XbhP0Jtp89Zo5zUnuidN9u9JTfyl8aR2OTkQE3BbdvwoX5awFom /5CQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="OP/s5WVy"; 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 b26si1907477ios.29.2021.05.20.03.14.24; Thu, 20 May 2021 03:14:24 -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="OP/s5WVy"; 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 S235145AbhETKPe (ORCPT + 12 others); Thu, 20 May 2021 06:15:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:43768 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235694AbhETKMF (ORCPT ); Thu, 20 May 2021 06:12:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 672046196E; Thu, 20 May 2021 09:43:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621503822; bh=fRBEVpGFEeuQFVQALto36Js2BDnb8czXNzo5M32cks4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OP/s5WVyVSxatn9FiKt+/ZJ7P1opUFUlh2osAYPqb3lWsFbGumE0STY6fOLHy7gxO x3aUt4OyijC8qghwbiqe0Mhb31rkQNxLcujP4wkp7UPayA7QF4ne2QLrwkvrjEWx3j EMYw+RjHzDaxux2003ErlWgzNXAz2oDwVhhAuRjM= 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.19 394/425] x86/msr: Fix wr/rdmsr_safe_regs_on_cpu() prototypes Date: Thu, 20 May 2021 11:22:43 +0200 Message-Id: <20210520092144.355459116@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092131.308959589@linuxfoundation.org> References: <20210520092131.308959589@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 @@ -253,7 +253,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; @@ -266,7 +266,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;