diff options
author | Brian Behlendorf <[email protected]> | 2018-04-04 09:54:20 -0700 |
---|---|---|
committer | GitHub <[email protected]> | 2018-04-04 09:54:20 -0700 |
commit | 581bc01a0765eed9ea7dc17132b3943a5efc966d (patch) | |
tree | 040ff3115a2e985a26b6e0a4da306258483fc24a | |
parent | 43983eb2024ec6b3280e6e06a6fb621ee3bb2a41 (diff) |
Remove sysevents
These headers are provided in the ZFS repository and never used
by the SPL. Remove them to ensure the right ones are included.
Reviewed-by: Tim Chase <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #696
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | include/sys/Makefile.am | 3 | ||||
-rw-r--r-- | include/sys/sysevent.h | 28 | ||||
-rw-r--r-- | include/sys/sysevent/Makefile.am | 13 | ||||
-rw-r--r-- | include/sys/sysevent/eventdefs.h | 28 |
5 files changed, 1 insertions, 72 deletions
diff --git a/configure.ac b/configure.ac index 70735ce2c..59ee3ca0b 100644 --- a/configure.ac +++ b/configure.ac @@ -67,7 +67,6 @@ AC_CONFIG_FILES([ include/sys/Makefile include/sys/fm/Makefile include/sys/fs/Makefile - include/sys/sysevent/Makefile include/util/Makefile include/vm/Makefile scripts/Makefile diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am index a16bd6ce6..45b658976 100644 --- a/include/sys/Makefile.am +++ b/include/sys/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = fm fs sysevent +SUBDIRS = fm fs COMMON_H = @@ -77,7 +77,6 @@ KERNEL_H = \ $(top_srcdir)/include/sys/sunddi.h \ $(top_srcdir)/include/sys/sunldi.h \ $(top_srcdir)/include/sys/sysdc.h \ - $(top_srcdir)/include/sys/sysevent.h \ $(top_srcdir)/include/sys/sysmacros.h \ $(top_srcdir)/include/sys/systeminfo.h \ $(top_srcdir)/include/sys/systm.h \ diff --git a/include/sys/sysevent.h b/include/sys/sysevent.h deleted file mode 100644 index 78e582f3c..000000000 --- a/include/sys/sysevent.h +++ /dev/null @@ -1,28 +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. - * For details, see <http://zfsonlinux.org/>. - * - * 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_SYSEVENT_H -#define _SPL_SYSEVENT_H - -#endif /* _SPL_SYSEVENT_H */ diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am deleted file mode 100644 index 63d9af310..000000000 --- a/include/sys/sysevent/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -COMMON_H = - -KERNEL_H = \ - $(top_srcdir)/include/sys/sysevent/eventdefs.h - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - -if CONFIG_KERNEL -kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent -kernel_HEADERS = $(KERNEL_H) -endif diff --git a/include/sys/sysevent/eventdefs.h b/include/sys/sysevent/eventdefs.h deleted file mode 100644 index f92cc4f82..000000000 --- a/include/sys/sysevent/eventdefs.h +++ /dev/null @@ -1,28 +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. - * For details, see <http://zfsonlinux.org/>. - * - * 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_SYSEVENT_EVENTDEFS_H -#define _SPL_SYSEVENT_EVENTDEFS_H - -#endif /* _SPL_SYSEVENT_EVENTDEFS_H */ |