From nobody Mon Jul 15 12:38:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WN1vr1xdzz5Qrvl; Mon, 15 Jul 2024 12:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WN1vq65nrz4Hsk; Mon, 15 Jul 2024 12:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LBtQSKHtUXBrCWETnzCPyR/VEyaF+ERaV90XHdX8MG8=; b=yet9MTIsm86lgFAVg57UFw4/TtX2cqO8MYS5XdL3VxQzPgxB8KWJN88vPZK/4jyfWi0pTX /PDRH3nQ4bdP2alEgkG7MbkZ/6idToRl29E2dSfo+Xh/sUOTjXihGWkMj/C7ebPkfm4DQR cLKH4QTZGtHqP17weSEALutBXz50fbsjiR4Wb4qBc6H613U/zPkPG0vPtmR9RFvW+6AsQ4 mDg6jkf/ylaRy/iGTlEgRqmoR0/7dK4Vz8sQ9vsjaUaSlz0oO6DIuIZEQRexhujD0byzMC dn9kNB5FleTe/82jxJKsBoHRDqUrPpCbvnJiHkwvNknTEYCuf9eY/BxZkco+Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721047111; a=rsa-sha256; cv=none; b=AWSIzG2mgqycAJpAG8YI0I7PeifNO6hu0Fq5Qv+MTrkvPisdcfSzSqFK2IJerNlZGbMO9I Hu8SHmrSmbS66EukSLQztGHGr5wzycpag3L/OAZbEDO2vErYXRtiZEsbzYrf2cwkFPGmsi ZAMJa3Q29pykiGNjd4UJtR3Fp/OFRE7Vspe5a2dZceHLCBXWbNZtkUlPgTtFWzkn2Pq3Lk sNwT80rkI6y8zWefe6QIjMjRoeFoNkN/nxeAPG34LmEs+9nrHxETjJtzsVVJBFR/KO2W3F Qw7u/f0zOzYrjRQ2jrZ/9nRXri2G3dr8/5jJbBKN9ajjIzvqw7bMNVPlXz/f0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LBtQSKHtUXBrCWETnzCPyR/VEyaF+ERaV90XHdX8MG8=; b=xVxAa4f0m1AlMPeBcUaIurEoJobKiDcs+F5FBO6/gLaO4z26QikKqgwkcUKTLcRwO5kSvh N3XFPak2RRwq1SZgiN6ZDlOXCwskVDi98RPIPHft9shuU0r7o0f6QPHIUiUeMrwmS+oywv 2J2UVFToxEtF7HDqk8xH2IcfTsGd5u+eZWz7cIYwZexaAVhSWn2pDk5RPNnalB5mj1lNz2 4X9mRL/Cwl/tQilGmv+a/2FVkt3JHx50R8xu1tN9VdJwxfXCJNBUWI7UkjbV03rFr+nFAW vpmIbWi2m4FvUrqFURFE5T0ylZNyREdoVylOZ+QmwejQW4nm0h43PsNMahInuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WN1vq5k1czt3L; Mon, 15 Jul 2024 12:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46FCcV6v061785; Mon, 15 Jul 2024 12:38:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FCcVFq061782; Mon, 15 Jul 2024 12:38:31 GMT (envelope-from git) Date: Mon, 15 Jul 2024 12:38:31 GMT Message-Id: <202407151238.46FCcVFq061782@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 258672fe62af - stable/14 - arm64: Fix indentation to be consistent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 258672fe62af8e59cb1e8fdb07f539561cc1a262 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=258672fe62af8e59cb1e8fdb07f539561cc1a262 commit 258672fe62af8e59cb1e8fdb07f539561cc1a262 Author: Andrew Turner AuthorDate: 2024-06-10 14:58:22 +0000 Commit: Andrew Turner CommitDate: 2024-07-15 12:28:37 +0000 arm64: Fix indentation to be consistent Adjust the mair_el1 macro indentation to be consistent with the surrounding macros. Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45524 (cherry picked from commit 86bafddd61aba115bc46bcf1d7e0afb125850b5f) --- sys/arm64/include/armreg.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index fee36bc9dd4e..b96d2223eb0b 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1496,13 +1496,13 @@ #define ID_ISAR5_VCMA_IMPL (UL(0x1) << ID_ISAR5_VCMA_SHIFT) /* MAIR_EL1 - Memory Attribute Indirection Register */ -#define MAIR_ATTR_MASK(idx) (UL(0xff) << ((n)* 8)) -#define MAIR_ATTR(attr, idx) ((attr) << ((idx) * 8)) -#define MAIR_DEVICE_nGnRnE UL(0x00) -#define MAIR_DEVICE_nGnRE UL(0x04) -#define MAIR_NORMAL_NC UL(0x44) -#define MAIR_NORMAL_WT UL(0xbb) -#define MAIR_NORMAL_WB UL(0xff) +#define MAIR_ATTR_MASK(idx) (UL(0xff) << ((n)* 8)) +#define MAIR_ATTR(attr, idx) ((attr) << ((idx) * 8)) +#define MAIR_DEVICE_nGnRnE UL(0x00) +#define MAIR_DEVICE_nGnRE UL(0x04) +#define MAIR_NORMAL_NC UL(0x44) +#define MAIR_NORMAL_WT UL(0xbb) +#define MAIR_NORMAL_WB UL(0xff) /* MDCCINT_EL1 */ #define MDCCINT_EL1 MRS_REG(MDCCINT_EL1)