From nobody Wed Nov 24 15:55:50 2021 X-Original-To: dev-commits-src-branches@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 AE1AC18B1847; Wed, 24 Nov 2021 15:55:50 +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 4HzlwQ2wLkz3QD5; Wed, 24 Nov 2021 15:55:50 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 4401E4BEE; Wed, 24 Nov 2021 15:55:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AOFtosk078324; Wed, 24 Nov 2021 15:55:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AOFtod5078323; Wed, 24 Nov 2021 15:55:50 GMT (envelope-from git) Date: Wed, 24 Nov 2021 15:55:50 GMT Message-Id: <202111241555.1AOFtod5078323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f69572733023 - stable/13 - Export symbols from opensolaris.ko and dtrace.ko List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f69572733023aa8017bddc5bed24358d3bc14847 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637769350; 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=GD/21h7dyyUrkk+r7BseuLpJNYueszJpF3ls5m0ZCbs=; b=YshPssfnM07lO7DvT8tJoFaAi05wDdNAlWeOWnAghFXRlzukMitz4Uxoa6fTy0r2G1eECA YQTwZSom/lkp4sTswgWIODiYdbMHE3uKxoBDo919x5/YDFcM9TKO/9aUVkNgqDY7X8C+So gf+Kz02yai7h6wuZtyuzpM0/IPCXPVX5jA1icLdH2IaILaydaNVsOaXJFUFxJ9TsAGwlwv XyUYMqDWEljimCODvazD4OQDyg8fb8YM1wYpw910ZPPKxU1ClF/reZdTuUXt2iOt63TXll Nd/kYjjCQroB07UiaNnWHVPW2O2EMieHUrdrhB0pCgHkud6PKm9RJvjsy9S7Ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637769350; a=rsa-sha256; cv=none; b=CLjOTuFlmL5bFlbeOIEVYiJXs3YQHboEBAaV41BP2kkmresnZbD2JtSMC2pswdu7iZOZNl Y7kYtrPyr4EIbQBeOIgNwwYc/bH8Mfv3mmsw7EoWhjTqLNDMl5+rzVuAWtEr7icA1RYcRq 6raQB9hMg8amxKEXoyzJTA1yT6GJQd7BxsGjloRmwGtrnUP15S2HjASnlWiyzfCQsqMILV KZYCwLLN6CCRp69qOes02P8jKtnwfsvUKkpxfGOeunnz8pM9erjsRzPihxn20mhYBvunDh zl+3kjOM2Q84vK+Emw5xQnRtlOu/JtO8BOKX3voaFpBKfXKDxw4hj280UvSQ9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f69572733023aa8017bddc5bed24358d3bc14847 commit f69572733023aa8017bddc5bed24358d3bc14847 Author: Mark Johnston AuthorDate: 2021-11-17 16:01:59 +0000 Commit: Mark Johnston CommitDate: 2021-11-24 15:55:37 +0000 Export symbols from opensolaris.ko and dtrace.ko Both modules provide many symbols used by various DTrace provider modules, so just export everything. Sponsored by: The FreeBSD Foundation (cherry picked from commit 8a693ccf86f90469910c5b2425ddb8a75e298487) --- sys/modules/dtrace/dtrace/Makefile | 4 +--- sys/modules/opensolaris/Makefile | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile index 55f9f4f66f36..712e10331a38 100644 --- a/sys/modules/dtrace/dtrace/Makefile +++ b/sys/modules/dtrace/dtrace/Makefile @@ -49,9 +49,7 @@ CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ -I${SYSDIR}/cddl/contrib/opensolaris/common/util \ -I${SYSDIR} -DDIS_MEM -EXPORT_SYMS= dtrace_register \ - dtrace_unregister \ - dtrace_probe_lookup +EXPORT_SYMS= YES dtrace_asm.o: assym.inc diff --git a/sys/modules/opensolaris/Makefile b/sys/modules/opensolaris/Makefile index 536b9637cd3c..7010485b0ee7 100644 --- a/sys/modules/opensolaris/Makefile +++ b/sys/modules/opensolaris/Makefile @@ -27,7 +27,7 @@ SRCS+= opensolaris_atomic.c CFLAGS+= ${OPENZFS_CFLAGS} -EXPORT_SYMS= cpu_core +EXPORT_SYMS= YES IGNORE_PRAGMA= 1