Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch

module/zfs/zfs_ioctl.c

@@ -67,7 +67,6 @@
 #include "zfs_namecheck.h"
 #include "zfs_prop.h"
 #include "zfs_deleg.h"
-#include "zfs_config.h"
 
 extern struct modlfs zfs_modlfs;
 
@@ -3796,27 +3795,15 @@ static struct dev_ops zfs_dev_ops = {
 };
 
 static struct modldrv zfs_modldrv = {
-#ifdef HAVE_SPL
-	NULL,
-#else
 	&mod_driverops,
-#endif /* HAVE_SPL */
 	"ZFS storage pool",
 	&zfs_dev_ops
 };
 
 static struct modlinkage modlinkage = {
 	MODREV_1,
-#ifdef HAVE_ZPL
 	(void *)&zfs_modlfs,
-#else
-	NULL,
-#endif /* HAVE_ZPL */
 	(void *)&zfs_modldrv,
-#ifdef HAVE_SPL
-	ZFS_MAJOR,
-	ZFS_MINORS,
-#endif /* HAVE_SPL */
 	NULL
 };
 
@@ -3847,8 +3834,6 @@ _init(void)
 	ASSERT(error == 0);
 	mutex_init(&zfs_share_lock, NULL, MUTEX_DEFAULT, NULL);
 
-	printk(KERN_INFO "ZFS: Loaded ZFS Filesystem v%s\n", ZFS_META_VERSION);
-
 	return (0);
 }
 
@@ -3881,17 +3866,8 @@ _fini(void)
 	return (error);
 }
 
-#ifdef HAVE_SPL
-spl_module_init(_init);
-spl_module_exit(_fini);
-
-MODULE_AUTHOR("Sun Microsystems, Inc");
-MODULE_DESCRIPTION("ZFS");
-MODULE_LICENSE("CDDL");
-#else
 int
 _info(struct modinfo *modinfop)
 {
 	return (mod_info(&modlinkage, modinfop));
 }
-#endif /* HAVE_SPL */