From nobody Thu Sep 29 12:34:58 2022 X-Original-To: dev-commits-src-all@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 4MdXr31Nrrz4clTF; Thu, 29 Sep 2022 12:34: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 4MdXr30tzNz3Zjq; Thu, 29 Sep 2022 12:34:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664454899; 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=Bo/XQAkE7/iK7CkgkWqf7H177FpOB5Zzn1rWNjitDmo=; b=T70EEj8QaIew+tSbPyWUpw9fDgdi14GvqxXOF6QAxmNkjcREqi/Y6tagb1/P5c4U1cx+Yk xjXxKznnZH/OXIlGMmu6k1+Rnq+yaaPrsAicQkxsoHxiPcBG2N934tGNE5qYAQXYcD79h3 AGpTc0c7tilqnSIbSPkYK4F/U+x0ycO40Vc3LF9Uz2bvdphSKgp66EFTMhADdu9Oly1UNq LrOsI53s1gM87KAlq3gVpoItaj5lJwhLgNCjFwcjnjQ7Dp65LXbGDQX5aZyvEvqoVxwJ5t 0MtUmijveeT+Z9x39Q4gAnKHGOuyg9b3ubbAqvpQXY2HgdL4o8OmkEMSw1vOZA== 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 4MdXr26ySMzphw; Thu, 29 Sep 2022 12:34:58 +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 28TCYw4T091181; Thu, 29 Sep 2022 12:34:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28TCYwpf091180; Thu, 29 Sep 2022 12:34:58 GMT (envelope-from git) Date: Thu, 29 Sep 2022 12:34:58 GMT Message-Id: <202209291234.28TCYwpf091180@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a2578094a321 - main - opensolaris: Delete unused sources List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: a2578094a32183ffc06014e4f5c13fe647869673 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664454899; 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=Bo/XQAkE7/iK7CkgkWqf7H177FpOB5Zzn1rWNjitDmo=; b=JlXf/sj/Mpzls59TlwmfEKrpEGDwBQWxksAddZzybA+2yTdCT51auCjBIZXvEkpGCs63jb nflUY0xL1WpYbKyqXOjiF12hetIly7Fx3NmsnQos6xPEzuEbbI/LgsqNif+z781dn5ifXA vIytHPFyjmHGwzzLAQvWxh8G3CwfAXKmFOA7AfbL+UYGxWPwhC7fLpvG6GqBtzv4Vsp72P BagThk86BthL1ut8jk2F8e750zNq57j8lPy1JyBQLOmGnOJIchZ+x2e9IYYDCjyzK3bRXa o0zzFFCSHz5H1MlK+0o1kdSiDPEV1Z0bFM4KZSk0wp+1ODHIzVnSwUpmhHJrSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664454899; a=rsa-sha256; cv=none; b=vEizXgDYvvWmDgF1FS1b95nAfPJ2ogsIvaYSOP1hrtMaHELTsmr208J6ckBAYdHUgWisIU dq3vNTVpgm1wb4p9v+gNNGBpuYFSgZYnfCHIrpSX2AQpzPuxIq64qUFdoqatx22umkVxLR A3JR4qWjW2qA8cWVHWzWUYeyxUZIUkpMRruBtTxxyP0sG8PGGIKz/EJ0XosMGpAq9dvnz4 V0IxqOJ1T3xeDoWUUrer6RGZHhSfxmZ3Z46Zl6AU7g0tI1EA6mBrlT4vnj6yFWo1Pjs58t n5pO1nHEqO9yZx+RInEeroWbTXZnz+FMMTJO5aBSe0P7ekiKoBYtHgOafN8umw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a2578094a32183ffc06014e4f5c13fe647869673 commit a2578094a32183ffc06014e4f5c13fe647869673 Author: Mark Johnston AuthorDate: 2022-09-29 12:33:38 +0000 Commit: Mark Johnston CommitDate: 2022-09-29 12:34:29 +0000 opensolaris: Delete unused sources The SDT implementation in the opensolaris compat module just defines the sdt:::set-error probe for ZFS. But OpenZFS provides its own implementation, and this one was not connected to the build. No functional change intended. MFC after: 1 week --- .../compat/opensolaris/kern/opensolaris_dtrace.c | 36 ----------------- sys/cddl/compat/opensolaris/sys/sdt.h | 45 ---------------------- 2 files changed, 81 deletions(-) diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c b/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c deleted file mode 100644 index 4d54b53fd4fe..000000000000 --- a/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c +++ /dev/null @@ -1,36 +0,0 @@ -/*- - * Copyright 2014 The FreeBSD Project. - * All rights reserved. - * - * This software was developed by Steven Hartland. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -__FBSDID("$FreeBSD$"); - -#include -#include -#include - -SDT_PROBE_DEFINE1(sdt, , , set__error, "int"); diff --git a/sys/cddl/compat/opensolaris/sys/sdt.h b/sys/cddl/compat/opensolaris/sys/sdt.h deleted file mode 100644 index 04e4abba88a9..000000000000 --- a/sys/cddl/compat/opensolaris/sys/sdt.h +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * Copyright (c) 2007 Pawel Jakub Dawidek - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _OPENSOLARIS_SYS_SDT_H_ -#define _OPENSOLARIS_SYS_SDT_H_ - -#include_next - -#ifdef KDTRACE_HOOKS -SDT_PROBE_DECLARE(sdt, , , set__error); - -#define SET_ERROR(err) \ - ((sdt_sdt___set__error->id ? \ - (*sdt_probe_func)(sdt_sdt___set__error->id, \ - (uintptr_t)err, 0, 0, 0, 0) : 0), err) -#else -#define SET_ERROR(err) (err) -#endif - -#endif /* _OPENSOLARIS_SYS_SDT_H_ */