From nobody Thu Dec 14 18:31:59 2023 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 4SrgtR5pQjz52pyV; Thu, 14 Dec 2023 18:31:59 +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 4SrgtR5CGwz4Gyl; Thu, 14 Dec 2023 18:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702578719; 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=Trx3AEy8AjRUpriFu0ziSGyDDpCutZy5PiCaVdwhpiQ=; b=UPGNCiqWgvne8MLbj0Q5MmCEx75EmJv79yIS9F4fIvgsfu8ONXAoHPcWSRNt4Ad5Hnk2qf e6zNq5MhjHNe+Ob9yutWgdVVisEa/GeMyF9WeVWuXqFdzG1g5KqJZUbrVhbt6apwjB0b1K HkzunMKI/cfDzBsTNYqK4SxEJWF+FkMNTYattZyJimDfVA503w3a+C4YdzRNbk0JFl3oyl NxLX6r4qFsyDwGLNa8JdLjV+6mkSQBTqncR0uQCfeQIMgzRizjGfcAyghz/Zhcna+651Jp 0MzBWjOd0c9cIqF1rGv4QuoPNZl/0pSR/NARFCjD1719zvpriadKgwGUmpfHHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702578719; a=rsa-sha256; cv=none; b=dKxkXq1xm+YneozqQXTGk6hh4eiR9YTiDei8ThMk3Q80lAm7hBhIeAzdj/bXtvii3HbDqj sUBDbPTILGJG+FVcrEV6v/nnVFiQdG2EQbZ0T0yMHT9qSFWsC79kigrhQleQdPNVxqSQeK Uge9csVm5UpT/1aefZezbk5PkNi9hrg6rjzVWSwYTfc3jt1Czhj4KgT+GiWXomPSNFiZM2 9kSE8egKhAy5+QAQjdh9HWlfzhupmhc7s134YWlTXeqELC+j/nD7GSQA+r1s0R9LUF4exw VbxfUiMxPnZfM9hmjkq/B423g2Ff5o4tlQ1ysax6liYdmv89Syps2tYMfS3ZxQ== 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=1702578719; 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=Trx3AEy8AjRUpriFu0ziSGyDDpCutZy5PiCaVdwhpiQ=; b=FxjPpzkTCerzmdwBnJa7drYGZBpv4Mcf+BvnFn5KKRUoJQuuQaPo8c4WiHj/CKGRFpG1po UhdGO7WXrnuD04UYKYYwH9yfWYkl+ZMKOWq/jGeOH3YN69ND5wZDEzntuKfOOrr4wFJGpS CWQ+DDh03lCxz9eq4KQT1kEMcVMzKrq0Va90kfphgQbw+K5w5MVZxAdRf5vT32wHTD623y elfpHO3CygRVlNENwWkk0+Tn/a1o3Z9kMGT0P4DLQ/zmfW26wkkJZxnQO5l3TIwQysTVME Fvag3W2Rf73NliQhjSyGM704FkD5KT2ZSub9GucOZ+5GuAKlIWI3LXLBxqW6jA== 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 4SrgtR4Ffwzf41; Thu, 14 Dec 2023 18:31:59 +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 3BEIVxSI067259; Thu, 14 Dec 2023 18:31:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEIVxUQ067256; Thu, 14 Dec 2023 18:31:59 GMT (envelope-from git) Date: Thu, 14 Dec 2023 18:31:59 GMT Message-Id: <202312141831.3BEIVxUQ067256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 3812c653b146 - main - Revert "Don't try and run kldxref for arm kernels" 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3812c653b1468bc97003c9f59cc13cfd9afb6ed1 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3812c653b1468bc97003c9f59cc13cfd9afb6ed1 commit 3812c653b1468bc97003c9f59cc13cfd9afb6ed1 Author: Jessica Clarke AuthorDate: 2023-12-14 18:27:09 +0000 Commit: Jessica Clarke CommitDate: 2023-12-14 18:27:09 +0000 Revert "Don't try and run kldxref for arm kernels" Now that kldxref supports arm this should not be needed. This reverts commit 0840bdbf2a07b68e29267bc49057ca6df2351360. --- sys/conf/kmod.mk | 3 +-- sys/modules/Makefile | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 4482034baf67..5d4dcd4371bc 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -354,8 +354,7 @@ _kmodinstall: .PHONY .include -# XXX: kldxref lacks support for arm -.if !defined(NO_XREF) && ${MACHINE_CPUARCH} != "arm" +.if !defined(NO_XREF) afterinstall: _kldxref .ORDER: realinstall _kldxref .ORDER: _installlinks _kldxref diff --git a/sys/modules/Makefile b/sys/modules/Makefile index dc914946ff41..c14933eebda4 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -908,8 +908,7 @@ SUBDIR:= ${SUBDIR:N${reject}} .endif # MODULES_OVERRIDE -- Keep last # Calling kldxref(8) for each module is expensive. -# XXX: kldxref lacks support for arm -.if !defined(NO_XREF) && ${MACHINE_CPUARCH} != "arm" +.if !defined(NO_XREF) .MAKEFLAGS+= -DNO_XREF afterinstall: .PHONY ${KLDXREF_CMD} ${DESTDIR}${KMODDIR}