Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3528965pxf; Mon, 15 Mar 2021 11:34:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy4nMW1y4UVM0rq/hNYmsUaFsbCegY6BFvMy2/UU2151uqgu/pPMPaqgnTHbC+ogTZph0b9 X-Received: by 2002:a17:906:4410:: with SMTP id x16mr25400850ejo.446.1615833288797; Mon, 15 Mar 2021 11:34:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615833288; cv=none; d=google.com; s=arc-20160816; b=mloQCwhCM+K7Lhf6m1zL7iaXE8wvkGb2r6qRd76XkjvGDDaO9FzDLgNqBFUhA1k0CM ZH55NhAIsXmDbLPfNionyIoizLLowQSUwLpz6ce+ba+1aye6KRi6YPpP/+gjYFykqEcr AlMVBAocq5e4E6To0/oOR0VOra2oB61ETckr3ICWhmXzeCkzRSK+tejVDpLeN+VTWHi7 JqEbIz5WUs7Qij8ov5aTEj82RrQgg1zXfC+OWSoOOsihk0fzc1w+bQz5lLbX2cq3wgEa 6NUOqVq1oXUhmrc6rTAebrqpbADroB2CRLw0TryUf1rm4PveF6fJKmy04fOV/5F7QcLj E4yA== 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=+AlnMnMoCtvDas2ZnRByKKLA1EYkqqi/cH2sepBCYeI=; b=0vSq2xFozl2HoNoQpKn2OVFxSn/HXnmzdPHukj63WnMYD9cBoR+IeOzWxTaeXb5nze 7wrp+NuUm0LaO9INpKekMWH+Crnjfa/y85EYJdaA69dgVlsFOunvAJBkAatsUxf8jkXF 9kbgc1iRU2cq5uivrI0K0hGMLlaVb8HjfKuVHoTp9Z2SNiw3WD7sMw/ZjOa/pMRtaVa0 t9OxrcEIXJlCZJpCSbOOiIL0RryjcPJpL9YJe8OUZo+faKMC2o9EnKNTP7g4rOoj0CUQ T4wD89cNUilocRe5d4hAKIHHVckU76l/c89cimB/LegpeTfPSUtmUcuCHkALr5PgMzjM XJVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Qsp+/YR0"; 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 bd28si10891416edb.570.2021.03.15.11.34.26; Mon, 15 Mar 2021 11:34:48 -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="Qsp+/YR0"; 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 S236198AbhCOOn5 (ORCPT + 99 others); Mon, 15 Mar 2021 10:43:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:49843 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232820AbhCOODl (ORCPT ); Mon, 15 Mar 2021 10:03:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F1F5464E83; Mon, 15 Mar 2021 14:03:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615817020; bh=lp7t4PAGlGJxwaLGTr21In+LijphDBOdYAJ98nN3adY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qsp+/YR0gC3xNLCIdiPs4Tsf5r9VVreaYMXJY6e5M5Pzjn/8+dCfcs7PKOTHaVXhe xfz8PVLFLJtJ4sxQZSDm8t8IY5PJAB1vCdyLoye7PC+Dcpp6RemcXI+ttuTq8NGuDO IyGhx2XL/90lIzW5km6EYCrWHb9hdM9t9m/zxHOg= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Axtens , Nicholas Piggin , Michael Ellerman , Sasha Levin Subject: [PATCH 5.11 263/306] powerpc/64s/exception: Clean up a missed SRR specifier Date: Mon, 15 Mar 2021 14:55:26 +0100 Message-Id: <20210315135516.533659446@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135507.611436477@linuxfoundation.org> References: <20210315135507.611436477@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: Greg Kroah-Hartman From: Daniel Axtens [ Upstream commit c080a173301ffc62cb6c76308c803c7fee05517a ] Nick's patch cleaning up the SRR specifiers in exception-64s.S missed a single instance of EXC_HV_OR_STD. Clean that up. Caught by clang's integrated assembler. Fixes: 3f7fbd97d07d ("powerpc/64s/exception: Clean up SRR specifiers") Signed-off-by: Daniel Axtens Acked-by: Nicholas Piggin Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20210225031006.1204774-2-dja@axtens.net Signed-off-by: Sasha Levin --- arch/powerpc/kernel/exceptions-64s.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 6e53f7638737..de988770a7e4 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -470,7 +470,7 @@ DEFINE_FIXED_SYMBOL(\name\()_common_real) ld r10,PACAKMSR(r13) /* get MSR value for kernel */ /* MSR[RI] is clear iff using SRR regs */ - .if IHSRR == EXC_HV_OR_STD + .if IHSRR_IF_HVMODE BEGIN_FTR_SECTION xori r10,r10,MSR_RI END_FTR_SECTION_IFCLR(CPU_FTR_HVMODE) -- 2.30.1