1 files changed, 28 insertions, 1 deletions

diff --git a/kernel/module.c b/kernel/module.c
index d9eae45d0145..dbce132b354c 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -824,9 +824,34 @@ static inline void module_unload_init(struct module *mod)
 }
 #endif /* CONFIG_MODULE_UNLOAD */
 
+static ssize_t show_initstate(struct module_attribute *mattr,
+                           struct module *mod, char *buffer)
+{
+        const char *state = "unknown";
+
+        switch (mod->state) {
+        case MODULE_STATE_LIVE:
+                state = "live";
+                break;
+        case MODULE_STATE_COMING:
+                state = "coming";
+                break;
+        case MODULE_STATE_GOING:
+                state = "going";
+                break;
+        }
+        return sprintf(buffer, "%s\n", state);
+}
+
+static struct module_attribute initstate = {
+        .attr = { .name = "initstate", .mode = 0444, .owner = THIS_MODULE },
+        .show = show_initstate,
+};
+
 static struct module_attribute *modinfo_attrs[] = {
         &modinfo_version,
         &modinfo_srcversion,
+        &initstate,
 #ifdef CONFIG_MODULE_UNLOAD
         &refcnt,
 #endif
@@ -1107,8 +1132,10 @@ static int mod_sysfs_setup(struct module *mod,
                 goto out;
 
         mod->drivers_dir = kobject_add_dir(&mod->mkobj.kobj, "drivers");
-        if (!mod->drivers_dir)
+        if (!mod->drivers_dir) {
+                err = -ENOMEM;
                 goto out_unreg;
+        }
 
         err = module_param_sysfs_setup(mod, kparam, num_params);
         if (err)