From patchwork Fri Jan 7 19:43:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Chancellor X-Patchwork-Id: 12707011 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 364EFC433F5 for ; Fri, 7 Jan 2022 19:45:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1wyANfAKqn7e7ZKV6gp1Rmmy12EYmkl9r4rRiH3cCYQ=; b=huL7H0k2GbF3Qm xrSLLpX97jJsMmpOc+TXa2fTLcZgT4fZERaviGpC9LkW6gQ3mmiJ0a1tv0AsOKFjHsi+xtPStcomK 0djo2q9HXv9Dl1XJVE+nEICJUgxd7XqFjTmU+HAPWcFRrpy85V4JJcsO1WzsnL/bAxDa2ApqGvhDl p0XynrZ1fKsGbjp2mewMSpPIE6ivvFhWc4p0+FVGXrsTVvO26L5RWYtWKhZTd/Lup4R1Q65Fc+utw 7465ONL6sw1CoxMSbQ/dzAwGp9jCO03iw7zADo9F8A7vb7QqEWjn2dAjYiL5sGgOY08zvGkxKW3qL 5LhKrpDNPWOe4T2U0SUg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5v9u-0056OJ-Vn; Fri, 07 Jan 2022 19:44:19 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5v9c-0056Jl-NE for linux-arm-kernel@lists.infradead.org; Fri, 07 Jan 2022 19:44:01 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id ED1C861EEC; Fri, 7 Jan 2022 19:43:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53217C36AE9; Fri, 7 Jan 2022 19:43:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1641584639; bh=m61fuw1pNqrst7HLX3tjWWgGYWOPsNFFFghJhYPmSmc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kbgPV3t8QrUmD2HnDIOaXpJIDDPm6qaXONETzG3lIat9eubaqXRAustox8oo0GtfW YRzJNxtvnJDXpsENKajOs0xiY1yRuRRDAN1KUuQ8pV5420B2iG2pVyPslI36nWvEqs UD/CTkBWE4duTwiFm4BdC67WFkqXcL8vmudiqBb4AKnlftH6Cwv1/Fq6WA+aR21sYA c4egkzXda5F++epcEqSYvKlffLED26LsdKZX4EeXXQZKWhglk+6EnWHfJSNjgjI3Bi 5TG+k/VVIg2XiBm0RiZDWZ0YUxwQAv+hKG/QMs0oEa5y4/mbLIvBu5tq0nHIpnn049 BiJutRHUN2wkw== From: Nathan Chancellor To: Greg Kroah-Hartman , Sasha Levin , Catalin Marinas , Will Deacon Cc: Mark Rutland , Marc Zyngier , Nick Desaulniers , linux-arm-kernel@lists.infradead.org, stable@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH RFC 4.9 2/5] arm64: Remove a redundancy in sysreg.h Date: Fri, 7 Jan 2022 12:43:32 -0700 Message-Id: <20220107194335.3090066-3-nathan@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220107194335.3090066-1-nathan@kernel.org> References: <20220107194335.3090066-1-nathan@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220107_114400_821621_F5738040 X-CRM114-Status: GOOD ( 12.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Stefan Traby commit d38338e396ee0571b3502962fd2fbaec4d2d9a8f upstream. This is really trivial; there is a dup (1 << 16) in the code Acked-by: Will Deacon Signed-off-by: Stefan Traby Signed-off-by: Marc Zyngier Signed-off-by: Nathan Chancellor --- arch/arm64/include/asm/sysreg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 88bbe364b6ae..7a9f0a71f441 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -95,8 +95,8 @@ #define SCTLR_ELx_M 1 #define SCTLR_EL2_RES1 ((1 << 4) | (1 << 5) | (1 << 11) | (1 << 16) | \ - (1 << 16) | (1 << 18) | (1 << 22) | (1 << 23) | \ - (1 << 28) | (1 << 29)) + (1 << 18) | (1 << 22) | (1 << 23) | (1 << 28) | \ + (1 << 29)) #define SCTLR_ELx_FLAGS (SCTLR_ELx_M | SCTLR_ELx_A | SCTLR_ELx_C | \ SCTLR_ELx_SA | SCTLR_ELx_I)