Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3354147pxf; Mon, 15 Mar 2021 07:50:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuK73B961xcaNXa3CeLfzxCGpYBTa7sAYtizsMqOPrhijFANpkk8Zmu3WsnL2ueWcr8+r5 X-Received: by 2002:a17:906:4705:: with SMTP id y5mr24289025ejq.119.1615819801286; Mon, 15 Mar 2021 07:50:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615819801; cv=none; d=google.com; s=arc-20160816; b=j2tvggQjlrzP+zRnNX+qQRF6KeBp3bcTCRcg2GS4S8NV2ub5ZQ28mNH+iP5esgxdor tJA4RmyoIaKWMwSJ4MBn3x0Y3AzzeZtUciK1YOnfOyjCwhBrl/leZ5vWAxeHXZsGgDTM L+HCvc+eoJF7RnPs6bfLMfnOg5oM2LeqUXFniPWSrd9/RE32Z7gT1vCbyeEMASkUivpm 1b58Apc9CWflorExnAGS937hbrOsCypotCmJe+muOz9ndcTbyuUybC9qLdwRh2x7JX7E Liw325Qp/2sB31x/PJDRLVehfLgWW4fXG64C/EADmMGS4KanH/ToSOXyxswGLNkwdy7N OZ6A== 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=Yqp7hhPcyvy50KfD0Twt43rEgr0MfeBU8ZGJO6mOOAc=; b=BhQsWza4ptwnAOfLbikN2fPwFHVxjkQxhDUpuptjmkvy2NWkV/yZdWR/5As2/Mcrfu /4FenPT9PeQ3WEtQAI3+D5G4YSqvG9m7kL9vTQt04jSezImWycyy/Uw0TxKVA67mWPv8 IZ4oebBybjAI9P6SuokXg7PuZwxVPI8m0e7GkAbiXxQxEncI0gYOV0KfDkmHTMvhcphs t9BKuMMnV6I+lLQABWsOWVld6cBY7IvjI+sou0p0eKv3OR89wWx09fIqHuS8cJyjufYg kpolNXfSaBCpDnplY088Hm5Ga7ZECwXmddSVCm/LZS1qTHxKz/C2sUIfv4azGCZtJnPo IdgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=d1N8wMYu; 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 t8si11444188edw.476.2021.03.15.07.49.37; Mon, 15 Mar 2021 07:50:01 -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=d1N8wMYu; 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 S237813AbhCOOoc (ORCPT + 99 others); Mon, 15 Mar 2021 10:44:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:50636 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232823AbhCOODx (ORCPT ); Mon, 15 Mar 2021 10:03:53 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4EC0964EE3; Mon, 15 Mar 2021 14:03:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615817032; bh=h0X38WufXpodO7S6ZRiHR8VH9Ou1WWFstY9gyKBLm/M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d1N8wMYu/kkQRT5XFV+40m5NHZ+l6BnellIDsUpVQJksSv2tOYZ9BL4rihkBDrDo2 Fv4n80K/Fs1VFM4lqYxlw4iwS3oA/nNM44LmUgc5MKqyg1qNJMsBcK6w3D0j+G0+KE yHXlSIMnC0f5Jj9Ku5x8Pt7AD4rlrdox+tbR4tOk= 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.10 256/290] powerpc/64s/exception: Clean up a missed SRR specifier Date: Mon, 15 Mar 2021 14:55:49 +0100 Message-Id: <20210315135550.662085080@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135541.921894249@linuxfoundation.org> References: <20210315135541.921894249@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 3cde2fbd74fc..9d3b468bd2d7 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