git: a2578094a321 - main - opensolaris: Delete unused sources
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 29 Sep 2022 12:34:58 UTC
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=a2578094a32183ffc06014e4f5c13fe647869673
commit a2578094a32183ffc06014e4f5c13fe647869673
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2022-09-29 12:33:38 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
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 <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/sdt.h>
-
-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 <pjd@FreeBSD.org>
- * 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 <sys/sdt.h>
-
-#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_ */