From nobody Mon Jul 15 12:38:34 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 4WN1vv0btdz5QrrX; Mon, 15 Jul 2024 12:38:35 +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 4WN1vt3FPNz4Hrf; Mon, 15 Jul 2024 12:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047114; 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=1Lz3Tyav7MrguEZ1lIVWixbjrcDTu1i+O94OdJMI8vI=; b=q8C/TnrTylYnV/CMou/1wuWG5fsR3k7dxeBdVIZkWSvl/maBfdvKW85Yk0IdOleXEaqY5Z sNZ3r9CAQo+xCl5FdZgJC7pxttOqF5AbhULL0t11WLaeWU3XIIxSzHhjvUE8+eLXlcod/O JWD1Fvdc46tfKljs94Uu/sFThHZ/jlBjFtOmN4Ewzc4nhTXl0FYDIOU1PEXBJnPKVasYJ2 bA9joInpDbs4GxzvHXCm9Wp171hlUPYrMQ+wYhHnwSuX5iO9jm6GEgphAM/rrcERSOP5ZC XDzcmA/vskAuRXO29HAp7CJfDIkxHJr0LzyHx7D+P199mpqKxcnlPFEWzHLF6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721047114; a=rsa-sha256; cv=none; b=YYDsdCpDaJq49ckfiS9K/OthVEGci6GwNJaGnQ0SrnYScAJjIAStmev28sufLwc7e0gu6c /NOEZGg1yKsO/aFjg1QLjqGQPDAjZIAsXpoJG/aNkXll0uIPR8DmUM9Wvdgwg8QvnHsgcG KfocDpU0B+DKtpQr0MiadPeUe7ddtpAbqTb6jOUwNVGY/SOeQIlrbeIcMHvv7fpwdNwHhj Rr8mpTkuqWe3AnK3EhgjEBGeDJXO04A31mf3EiumDxrEpq8zFU0rZDIEFHWDi9UOXGHn8z ADHFq7IfUcKDSkL1mhwz0wnzouocsF7alIIv1FDNIeO7AQHezNKsL3xk4NVCxg== 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=1721047114; 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=1Lz3Tyav7MrguEZ1lIVWixbjrcDTu1i+O94OdJMI8vI=; b=WMg9jq4JjEAwg3JEeSNfsmyjXvmSkv7AEv9hWImsYzctTlSz6w4nEaxHPLWcA29HzXBKZn s5vjcdJslPujmJRQSySxqvovB7eJ0QZ5L7oHn0JRqG7FqV6d1bXL9v9f3HGNjs73mZuzDr bTvI9yFWrOwcya4IFbnHANSILb2u1X9P4Ld0N05y82Wf/wc4jXrFvYCH7HiIORTGBVGvGQ jYwNw0uKjBntYqQ6/uMdstDQR7NbwOlNPOnQ8f1lW76me4zVzHTl3qup+PZyvROqV9iC3q IkndXxpIxdp56+2yRTvtq7jDIJiKGNgBcLd3UhANQ+vYtSy7XR1pPy/ZTZBCjw== 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 4WN1vt2pb8zsrs; Mon, 15 Jul 2024 12:38:34 +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 46FCcYOq062004; Mon, 15 Jul 2024 12:38:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FCcYIF062001; Mon, 15 Jul 2024 12:38:34 GMT (envelope-from git) Date: Mon, 15 Jul 2024 12:38:34 GMT Message-Id: <202407151238.46FCcYIF062001@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: c73d1e81b68e - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: c73d1e81b68e04bd3b5967e616439992c644e842 Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c73d1e81b68e04bd3b5967e616439992c644e842 commit c73d1e81b68e04bd3b5967e616439992c644e842 Author: Andrew Turner AuthorDate: 2024-06-10 14:58:22 +0000 Commit: Andrew Turner CommitDate: 2024-07-15 12:35:21 +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 053f7a6d0afc..1a194075990d 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1499,13 +1499,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)