Add missing policy includes, add missing sun ddi bits

diff --git a/include/sys/policy.h b/include/sys/policy.h
index d10d8f79fc32e1b63c2d5da479e6142f09c740d4..f6467fe18ca38d75f2dd68ff30309d41257c44c6 100644 (file)
--- a/include/sys/policy.h
+++ b/include/sys/policy.h
@@ -1,4 +1,10 @@
 #ifndef _SPL_POLICY_H
 #define _SPL_POLICY_H
 
+#define secpolicy_fs_unmount(c,vfs)    (0)
+#define secpolicy_nfs(c)               (0)
+#define secpolicy_sys_config(c,co)     (0)
+#define secpolicy_zfs(c)               (0)
+#define secpolicy_zinject(c)           (0)
+
 #endif /* SPL_POLICY_H */

diff --git a/include/sys/sunddi.h b/include/sys/sunddi.h
index 090a367fe45f837c6f05a32983b1b8451e6292de..d2e71ebd5044f3239a8404d3ee5aa742d19a9504 100644 (file)
--- a/include/sys/sunddi.h
+++ b/include/sys/sunddi.h
@@ -136,6 +136,7 @@ typedef struct dev_ops {
        struct cb_ops *devo_cb_ops;
        struct bus_ops *devo_bus_ops;
        int (*devo_power)(dev_info_t *dip, int component, int level);
+       int (*devo_quiesce)(dev_info_t *dip);
 } dev_ops_t;
 
 typedef struct mod_ops {
@@ -198,6 +199,7 @@ extern int __ddi_create_minor_node(dev_info_t *dip, char *name, int spec_type,
                                    minor_t minor_num, char *node_type,
                                   int flags, struct module *mod);
 extern void __ddi_remove_minor_node(dev_info_t *dip, char *name);
+extern int ddi_quiesce_not_needed(dev_info_t *dip);
 extern int __mod_install(struct modlinkage *modlp);
 extern int __mod_remove(struct modlinkage *modlp);
 

diff --git a/modules/spl/spl-module.c b/modules/spl/spl-module.c
index 700c7618292c3651fa752dc472d9c89a6819d782..817b1e31efd6de67b86d56c660aee7631e1bcdce 100644 (file)
--- a/modules/spl/spl-module.c
+++ b/modules/spl/spl-module.c
@@ -188,6 +188,12 @@ __ddi_remove_minor_node(dev_info_t *di, char *name)
 }
 EXPORT_SYMBOL(__ddi_remove_minor_node);
 
+int
+ddi_quiesce_not_needed(dev_info_t *dip)
+{
+       RETURN(DDI_SUCCESS);
+}
+
 #if 0
 static int
 mod_generic_open(struct inode *, struct file *)