Merge branch 'beta'

1 files changed, 7 insertions, 52 deletions

diff --git a/plugins/imklog/module.h b/plugins/imklog/module.h
index 71eac2c4..7a26ad02 100644
--- a/plugins/imklog/module.h
+++ b/plugins/imklog/module.h
@@ -19,63 +19,18 @@
  *
  * A copy of the GPL can be found in the file "COPYING" in this distribution.
  */
-struct kernel_sym
-{
-	        unsigned long value;
-	        char name[60];
-};
 
-struct module_symbol
+struct sym_table
 {
-	unsigned long value;
-	const char *name;
+        unsigned long value;
+        char *name;
 };
 
-struct module_ref
+struct Module
 {
-	struct module *dep;     /* "parent" pointer */
-	struct module *ref;     /* "child" pointer */
-	struct module_ref *next_ref;
-};
+        struct sym_table *sym_array;
+        int num_syms;
 
-struct module_info
-{
-	unsigned long addr;
-	unsigned long size;
-	unsigned long flags;
-	long usecount;
+        char *name;
 };
 
-
-typedef struct { volatile int counter; } atomic_t;
-
-struct module
-{
-	unsigned long size_of_struct;   /* == sizeof(module) */
-	struct module *next;
-	const char *name;
-	unsigned long size;
-	
-	union
-	{
-		atomic_t usecount;
-		long pad;
-        } uc;                           /* Needs to keep its size - so says rth */
-	
-	unsigned long flags;            /* AUTOCLEAN et al */
-	
-	unsigned nsyms;
-	unsigned ndeps;
-	
-	struct module_symbol *syms;
-	struct module_ref *deps;
-	struct module_ref *refs;
-	int (*init)(void);
-	void (*cleanup)(void);
-	const struct exception_table_entry *ex_table_start;
-	const struct exception_table_entry *ex_table_end;
-#ifdef __alpha__
-	unsigned long gp;
-#endif
-};
-