From nobody Mon Oct 27 12:02:28 2025 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 4cwBvn0Jnwz6DS9p; Mon, 27 Oct 2025 12:02:29 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwBvm2sHtz3CSy; Mon, 27 Oct 2025 12:02:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761566548; 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=/H0kAc/1CDDjFjYO31dNCn4OiL1lVcYFpJxRgelBBXY=; b=DNaqaeeiIPFfYKmvTV+F8vMgeyk8Gk0ase23EKV2BsgSYdDhR41JD15rXCfeZ1gP0gjLCj mZ9KlGsgn3Mv1qAQuCULhrP20ji7EzAM6XO6Xo/Lww4hmGuQwAFV9mD64MV017bcQuy1oY /2hp+vxQOtk/bz5s997JqdlYLkyzVkj+8BHkbufQ7RyE7Uwfp4T7WLakvK/ifSTZ0U4A3u YZ7P+TXzGWKpQIFjDvirhm97e5WjzZ7pALBAHxYApwYDJV07PpOx8VdrgNiAvlllTf9QVP eKvj8+vGn8AHJRvzYOUVU8DHqfT4O4RGCvfrIFRRBXXb9z2ToN1EV7xSrcS5iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761566548; 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=/H0kAc/1CDDjFjYO31dNCn4OiL1lVcYFpJxRgelBBXY=; b=r8B9RbiekD9rbsXzgNIypRwmZNv+vD9+V08sRUEElzBtaHgvyJBdvaff49GdAvenIKDtMK sjcSlAyfzZ3OKyauPMfsvEzg5RPYJQkrB5m9x9YhGsps4aiyj/C9tdavW4aojY2QVfReeK csks9CXbsMEDr2fcYhoOMPkmXTuvm1/PTT1SSOrBZyZh3nH4WIK0Lvxt7vNDHKD2+QDltA Wi0tYTNiR4ERT70kMeY3EzqHfYb6MNKFHu9mITxkROMCpDJi1BGxLVa60IZ/bkjTfz8te0 Wi+71s0n/Qi3O1I6vg9qhKImYIsx1ZWQhjnFKqeMUYCcxuxMISP51gcye9pvSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761566548; a=rsa-sha256; cv=none; b=h2VUEsr+sBZrArzKs4Ic1iPsC52VQQc+Ke7L1MO+Lc7oEsRljBuRU427gsNgOcB88pxdLB liO4XnDhe4Vm9ULIfa9DHzBHvxbZC1TV7do0dmbAZaSkY4I6Nu9Gc7mwFSJFl3AFCXtIcd pmIJUi4i9s2hW1+7kEyI8eq1d6W4cjdohRHaZcp7DBHUvRnVfX/MJP5A2+sQIlA4WgmXjx i6WSoauV+tQzcuJsC2QDarZNHb0JVnE2XM/TwfOQYwDzST03IRtv+4pcPUY0jldDU8BP0c ISmvmDKcied2rvBu7mZeRRrROCun82ZMSwaJ1Zq3RSPWwhXwoRQc+V2+FojM1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cwBvm29F7z1HTJ; Mon, 27 Oct 2025 12:02:28 +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 59RC2SZe077517; Mon, 27 Oct 2025 12:02:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RC2SXE077515; Mon, 27 Oct 2025 12:02:28 GMT (envelope-from git) Date: Mon, 27 Oct 2025 12:02:28 GMT Message-Id: <202510271202.59RC2SXE077515@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: 95a5bfcee07c - main - arm64: Use _armreg.h in cpu.h 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: 95a5bfcee07cf522edab72388decc4d6e27d341d Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=95a5bfcee07cf522edab72388decc4d6e27d341d commit 95a5bfcee07cf522edab72388decc4d6e27d341d Author: Andrew Turner AuthorDate: 2025-10-27 10:56:25 +0000 Commit: Andrew Turner CommitDate: 2025-10-27 11:36:17 +0000 arm64: Use _armreg.h in cpu.h We only needed armreg.h for the *_SPECIALREG macros. Use the new _armreg.h directly. Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53325 --- sys/arm64/include/_armreg.h | 1 + sys/arm64/include/cpu.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm64/include/_armreg.h b/sys/arm64/include/_armreg.h index 7aa3c358b327..0f5134e5a978 100644 --- a/sys/arm64/include/_armreg.h +++ b/sys/arm64/include/_armreg.h @@ -28,6 +28,7 @@ */ #if !defined(_MACHINE_ARMREG_H_) && \ + !defined(_MACHINE_CPU_H_) && \ !defined(_MACHINE_HYPERVISOR_H_) #error Do not include this file directly #endif diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h index 124da8c215ed..b15210633d37 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -43,10 +43,10 @@ #define _MACHINE_CPU_H_ #if !defined(__ASSEMBLER__) +#include #include #include #endif -#include #define TRAPF_PC(tfp) ((tfp)->tf_elr) #define TRAPF_USERMODE(tfp) (((tfp)->tf_spsr & PSR_M_MASK) == PSR_M_EL0t)