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 <tim@chase2k.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #696

diff --git a/configure.ac b/configure.ac
index 70735ce2cf42deee7fa40c4fb3828c70df18fa9d..59ee3ca0badbbf4c8f678c5281775d3aa3181cc4 100644 (file)
--- 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 a16bd6ce6feddff1a66c84126038a880dfee0174..45b658976f7e3130fc9d6df5f5a3da74f05235d6 100644 (file)
--- 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 (file)
index 78e582f..0000000
--- 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 <behlendorf1@llnl.gov>.
- *  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 (file)
index 63d9af3..0000000
--- 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 (file)
index f92cc4f..0000000
--- 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 <behlendorf1@llnl.gov>.
- *  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 */