diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/os/freebsd/spl/sys/Makefile.am | 1 | ||||
| -rw-r--r-- | include/os/freebsd/spl/sys/console.h | 35 | ||||
| -rw-r--r-- | include/os/linux/spl/sys/Makefile.am | 1 | ||||
| -rw-r--r-- | include/os/linux/spl/sys/console.h | 30 | ||||
| -rw-r--r-- | include/sys/fm/util.h | 1 |
5 files changed, 0 insertions, 68 deletions
diff --git a/include/os/freebsd/spl/sys/Makefile.am b/include/os/freebsd/spl/sys/Makefile.am index 6bee47830..4bb9beffc 100644 --- a/include/os/freebsd/spl/sys/Makefile.am +++ b/include/os/freebsd/spl/sys/Makefile.am @@ -8,7 +8,6 @@ KERNEL_H = \ ccompile.h \ cmn_err.h \ condvar.h \ - console.h \ cred.h \ ctype.h \ debug.h \ diff --git a/include/os/freebsd/spl/sys/console.h b/include/os/freebsd/spl/sys/console.h deleted file mode 100644 index a0bf8175e..000000000 --- a/include/os/freebsd/spl/sys/console.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2020 iXsystems, Inc. - * 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 _SPL_CONSOLE_H -#define _SPL_CONSOLE_H - -#define console_vprintf vprintf -#define console_printf printf - -#endif /* _SPL_CONSOLE_H */ diff --git a/include/os/linux/spl/sys/Makefile.am b/include/os/linux/spl/sys/Makefile.am index 0fd4cd37a..a5b0d78e8 100644 --- a/include/os/linux/spl/sys/Makefile.am +++ b/include/os/linux/spl/sys/Makefile.am @@ -6,7 +6,6 @@ KERNEL_H = \ callo.h \ cmn_err.h \ condvar.h \ - console.h \ cred.h \ ctype.h \ debug.h \ diff --git a/include/os/linux/spl/sys/console.h b/include/os/linux/spl/sys/console.h deleted file mode 100644 index 6af395cc2..000000000 --- a/include/os/linux/spl/sys/console.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC. - * Copyright (C) 2007 The Regents of the University of California. - * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). - * Written by Brian Behlendorf <[email protected]>. - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * - * The SPL is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * The SPL is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with the SPL. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef _SPL_CONSOLE_H -#define _SPL_CONSOLE_H - -#define console_vprintf vprintk -#define console_printf printk - -#endif /* _SPL_CONSOLE_H */ diff --git a/include/sys/fm/util.h b/include/sys/fm/util.h index ea8c61a8b..56ba8798b 100644 --- a/include/sys/fm/util.h +++ b/include/sys/fm/util.h @@ -92,7 +92,6 @@ typedef struct zfs_zevent { extern void fm_init(void); extern void fm_fini(void); -extern void fm_nvprint(nvlist_t *); extern void zfs_zevent_post_cb(nvlist_t *nvl, nvlist_t *detector); extern int zfs_zevent_post(nvlist_t *, nvlist_t *, zevent_cb_t *); extern void zfs_zevent_drain_all(int *); |