From nobody Mon Jun 10 15:29:41 2024 X-Original-To: dev-commits-src-main@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 4VybMV13ryz5M5sL; Mon, 10 Jun 2024 15:29:42 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VybMT70lbz4jS8; Mon, 10 Jun 2024 15:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718033382; 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=94W+ZvKT5OasXHusGERtFwrQ6m4AOlwtx8t/wc8UMX4=; b=OI3Loz/Vp2Mhxdzi0eBolzsGVpkpL+w4NssLWFCv7uOfl38npH6OlEv3ut1Fs/YuD4n599 tw6AN2gMc8t0bd1kR8PKqJOF++dnSrVC79z6wxdvtCjsK/Cqlq1inRvRI0xsS/r9DwXvuj FDf5zYxD5rMmuKh/ZQrDjdZYfJQ4p4ghqyoahPZ0T3f+kXpYTcIZ3koBu1WCG4geJXTPrX fcXfFQ0U34ncBPXhIymPRjnBvrVGhjCiKGEprSRulY3UJy9ALPgB9JV35aQV/GwlIfhldf rDQ4oYi50tRto2JwAFUwO0y2IwELqsmxsy/dWAaZqgOlPp1MfxQBjdalo0ga2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718033382; a=rsa-sha256; cv=none; b=dBllFcB3XPELpF/BConsEcdwJDVP8T6qQUDdXwf67dGIo3WD6qFfzPFbGjzyV9v4rTJTre vo/jS4pIaiGZfrNSaxOJmav74vUwHad9FOVEFRRepq05k0AEVtcL2DioQlNKJR7X265Tke 2S/FCnhs00naQRX6XjUkPUL5qLZ7l8j/VsgesrGhonOQFWhUZFj859ynwTg5sVVm7p0POC kSLacFCkC5A4dvHxt9dEu4/sQjpK/BR9Sro3Z+askBnDtaLveXJWMx/jgPV/uhHnXZFNgk 3Wu5Ho/10JQ/vOTounAxKnIlQwDhRFdSDaZXCyo47qDX8yTOQ32ZQDn0yLzNlQ== 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=1718033382; 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=94W+ZvKT5OasXHusGERtFwrQ6m4AOlwtx8t/wc8UMX4=; b=ZHq5t6NArdx2l1x2epicksZ9zpkDXrxOaCdo9PxoY6zMW3k48c8ycOCGxYODwkzkS5JOco 3K7qd/9/sPLAl5AABu+J0BVW7SxhEuzsgmNooiYeFDqB/es/TjAnlLeE3Ul3IGnFHFyM4d TQx4hbYhpnTijbi/LH5y/lZ44CHluIj4/8CWGlj62XgfBZZJZ0hLk8VW9f60XMzAKI5r8S Kto5TqbdbYIoMIHV4SrkKQfwnUY6zvH5gAOXrUKGN1HsgdOcNR3XiePRhnx1W0zvFrfOj6 fHT4gcvY5qQfOYqLg3Dxi4IKazudgZC2G9DR4T/GwGIO5COrkGI3xaXcCPvxMw== 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 4VybMT6YS6zX5j; Mon, 10 Jun 2024 15:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45AFTfiA039322; Mon, 10 Jun 2024 15:29:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45AFTf10039319; Mon, 10 Jun 2024 15:29:41 GMT (envelope-from git) Date: Mon, 10 Jun 2024 15:29:41 GMT Message-Id: <202406101529.45AFTf10039319@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 86bafddd61ab - main - arm64: Fix indentation to be consistent List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 86bafddd61aba115bc46bcf1d7e0afb125850b5f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=86bafddd61aba115bc46bcf1d7e0afb125850b5f commit 86bafddd61aba115bc46bcf1d7e0afb125850b5f Author: Andrew Turner AuthorDate: 2024-06-10 14:58:22 +0000 Commit: Andrew Turner CommitDate: 2024-06-10 15:16:10 +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 --- 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 7bdb28aad1e5..194731c98902 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1505,13 +1505,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)