From nobody Fri Dec 06 17:54:52 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 4Y4f6N2y9Fz5gcnF; Fri, 06 Dec 2024 17:54:52 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4f6N20ctz4ndk; Fri, 6 Dec 2024 17:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733507692; 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=/4JMM3n7Fp/iHX7L9eYuhkORXBxT3sX86keaHU65aK8=; b=AphLtT1qFSV2CjA4hl48smDW+AE2lCOsv7T2F8PKZ/CmmaFrEqF7PA1A8qachMTfXopKdH QT4IF91Xm+rkmJVsiPYEmaDS0wYLTJbSw+VwsYELxjwxSxYaOWgpopEYvUw6a9hWO+HMHR Byp4W5ed0OYgimzr+xbxSNiXLYLCbLH+itYt7iVpV8eR1vqf4KaiYoHVckH6t/U7NuZeen 0A+He8jeIwdBJ4ELrtIv5F62egC/IvKjYR8SO+jZG976Rp8kNYhQlw4qf+eEM/7zJ45qiv I4oLaxjwvl7ZmBaWIDxfMR5fbNlpIa6UAcxTeRRNMaBbCgrPYSqJSdd8ZpCgKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733507692; 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=/4JMM3n7Fp/iHX7L9eYuhkORXBxT3sX86keaHU65aK8=; b=CDT0bAErt6bo84bub1jkw9NiMHKXoEqV5Kb52m3u/WdgqVgzKvALefoBa8bomWroyu5jPD 9JBO2/GXOcdkw7YPVSPFAusFekb/5JxtUU1f57FJTjUxgACj0l+MymN4F9VCMkKfLdMgZ1 aecImHpC6jD+S8uG0JcR5LVQH1xh+oGCVwm7iy6tpQk2W06clVXhEas2zgVW+Xvm/DI1Bi se5abnBB6ULsPpP+vBpWZOq3tKnpI8f+kbEu64mlY1W7oVvfrQJh2i8W/helMk4gHvaNdH mRq3IdAMWvU8bTamLY7mMa3xwnaUsT3X/SSBeaNIUcB9JpRgPjjbqCvnbXNenw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733507692; a=rsa-sha256; cv=none; b=iOconGriUgLPYtQgMRm8lbqKKRQb4MDxQYrBZnzFis3KYOov7Fh1RUvNF6jQS6pjNy+ZAh 8Js+LgZcFYALkftefl/WUYfCKsW2rWugn3SBsZO2y5lqZLmhETnzc1bALgqoXSyo1tUtGu N4uO2wtgTYBD2EEKSlhTjayqGxRVRDMKZphKGCrNoIGCxjxLleeY2dsynBbLuyL1jD7rXc Sn78GZ29nXvtowoFzsov3EXNcaj1F+B+JFRY8/y66/Wh7fn4MScBiJKUa3qaYHEU0JxXeU 0IP/pudxvPofU7f4FlkxmcIucinGHCue6h60WkflmtosV9xjzOflrGT5mXRdlg== 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 4Y4f6N1YRMzngh; Fri, 6 Dec 2024 17:54:52 +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 4B6Hsqw7066685; Fri, 6 Dec 2024 17:54:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6HsqqX066682; Fri, 6 Dec 2024 17:54:52 GMT (envelope-from git) Date: Fri, 6 Dec 2024 17:54:52 GMT Message-Id: <202412061754.4B6HsqqX066682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d1e843b3f976 - main - arm: Use constants from sys/intr.h, not genassym 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1e843b3f976528fbea04e702a20219d532220d3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d1e843b3f976528fbea04e702a20219d532220d3 commit d1e843b3f976528fbea04e702a20219d532220d3 Author: Warner Losh AuthorDate: 2024-12-06 17:30:13 +0000 Commit: Warner Losh CommitDate: 2024-12-06 17:31:36 +0000 arm: Use constants from sys/intr.h, not genassym We can now include sys/intr.h to get these constants rather than using genassym. Opt for this simpler method. PR: 283041 Sponsored by: Netflix Reviewed by: mmel, andrew Differential Revision: https://reviews.freebsd.org/D47847 --- sys/arm/arm/exception.S | 1 + sys/arm/arm/genassym.c | 4 ---- sys/arm64/arm64/exception.S | 1 + sys/arm64/arm64/genassym.c | 5 ----- sys/riscv/riscv/genassym.c | 2 -- 5 files changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/arm/arm/exception.S b/sys/arm/arm/exception.S index 3df91d6e3c1e..2c25628f77cc 100644 --- a/sys/arm/arm/exception.S +++ b/sys/arm/arm/exception.S @@ -52,6 +52,7 @@ #include #include #include +#include #ifdef KDTRACE_HOOKS .bss diff --git a/sys/arm/arm/genassym.c b/sys/arm/arm/genassym.c index 9d6232739022..24c470bdde86 100644 --- a/sys/arm/arm/genassym.c +++ b/sys/arm/arm/genassym.c @@ -28,11 +28,9 @@ */ #include -#include #include #include #include -#include #include #include #include @@ -131,8 +129,6 @@ ASSYM(DCACHE_LINE_MASK, offsetof(struct cpuinfo, dcache_line_mask)); ASSYM(ICACHE_LINE_SIZE, offsetof(struct cpuinfo, icache_line_size)); ASSYM(ICACHE_LINE_MASK, offsetof(struct cpuinfo, icache_line_mask)); -ASSYM(INTR_ROOT_IRQ, INTR_ROOT_IRQ); - /* * Emit the LOCORE_MAP_MB option as a #define only if the option was set. */ diff --git a/sys/arm64/arm64/exception.S b/sys/arm64/arm64/exception.S index d8c024d01921..13095def8b00 100644 --- a/sys/arm64/arm64/exception.S +++ b/sys/arm64/arm64/exception.S @@ -31,6 +31,7 @@ #include #include "assym.inc" +#include .text diff --git a/sys/arm64/arm64/genassym.c b/sys/arm64/arm64/genassym.c index 3ca712ca3de3..e3977798b046 100644 --- a/sys/arm64/arm64/genassym.c +++ b/sys/arm64/arm64/genassym.c @@ -28,8 +28,6 @@ #include #include -#include -#include #include #include @@ -85,6 +83,3 @@ ASSYM(TF_ELR, offsetof(struct trapframe, tf_elr)); ASSYM(TF_SPSR, offsetof(struct trapframe, tf_spsr)); ASSYM(TF_ESR, offsetof(struct trapframe, tf_esr)); ASSYM(TF_X, offsetof(struct trapframe, tf_x)); - -ASSYM(INTR_ROOT_IRQ, INTR_ROOT_IRQ); -ASSYM(INTR_ROOT_FIQ, INTR_ROOT_FIQ); diff --git a/sys/riscv/riscv/genassym.c b/sys/riscv/riscv/genassym.c index 74b70858edab..77966913fd1b 100644 --- a/sys/riscv/riscv/genassym.c +++ b/sys/riscv/riscv/genassym.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -51,7 +50,6 @@ #include #include #include -#include #include #include