Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 9 insertions, 1 deletions

diff --git a/include/linux/module.h b/include/linux/module.h
index d33df2408e05..419d3ef293dd 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -58,6 +58,7 @@ struct module_kobject
 {
         struct kobject kobj;
         struct module *mod;
+        struct kobject *drivers_dir;
 };
 
 /* These are either module local, or the kernel's dummy ones. */
@@ -263,7 +264,7 @@ struct module
         struct module_attribute *modinfo_attrs;
         const char *version;
         const char *srcversion;
-        struct kobject *drivers_dir;
+        struct kobject *holders_dir;
 
         /* Exported symbols */
         const struct kernel_symbol *syms;
@@ -319,6 +320,13 @@ struct module
 
         unsigned int taints;    /* same bits as kernel:tainted */
 
+#ifdef CONFIG_GENERIC_BUG
+        /* Support for BUG */
+        struct list_head bug_list;
+        struct bug_entry *bug_table;
+        unsigned num_bugs;
+#endif
+
 #ifdef CONFIG_MODULE_UNLOAD
         /* Reference counts */
         struct module_ref ref[NR_CPUS];