Module cleanups

PATCH New Brian Gerst 1 participant 1 message Nov 19, 2000 Module support

lore

Share & tools

lore

Brian Gerst

author

2000-11-19 15:35 UTC #0 lore raw

PATCH 1/1 Module cleanups

Three small patches against test11-pre7

1) creates arch_init_modules(), removes alpha specific code from module.c
2) makes non-modular try_inc_use_count() an inline for better optimization.
3) Creates __modinfo define.

Signature · 1 line

						Brian Gerst

include/asm-alpha/module.h +5 -0

diff -urN linux-2.4.0t11p7/include/asm-alpha/module.h linux/include/asm-alpha/module.h
@@ -8,4 +8,9 @@
 #define module_unmap(x)		vfree(x)
 #define module_arch_init(x)	(0)
 
+static inline void arch_init_modules(void)
+{
+	__asm__("stq $29,%0" : "=m"(kernel_module.gp));
+}
+
 #endif /* _ASM_ALPHA_MODULE_H */

include/asm-arm/module.h +1 -0

diff -urN linux-2.4.0t11p7/include/asm-arm/module.h linux/include/asm-arm/module.h
@@ -7,5 +7,6 @@
 #define module_map(x)		vmalloc(x)
 #define module_unmap(x)		vfree(x)
 #define module_arch_init(x)	(0)
+#define arch_init_modules()	do { } while (0)
 
 #endif /* _ASM_ARM_MODULE_H */

include/asm-i386/module.h +1 -0

diff -urN linux-2.4.0t11p7/include/asm-i386/module.h linux/include/asm-i386/module.h
@@ -7,5 +7,6 @@
 #define module_map(x)		vmalloc(x)
 #define module_unmap(x)		vfree(x)
 #define module_arch_init(x)	(0)
+#define arch_init_modules()	do { } while (0)
 
 #endif /* _ASM_I386_MODULE_H */

include/asm-ia64/module.h +1 -0

diff -urN linux-2.4.0t11p7/include/asm-ia64/module.h linux/include/asm-ia64/module.h
@@ -15,6 +15,7 @@
 #define module_map(x)		vmalloc(x)
 #define module_unmap(x)		ia64_module_unmap(x)
 #define module_arch_init(x)	ia64_module_init(x)
+#define arch_init_modules()	do { } while (0)
 
 /*
  * This must match in size and layout the data created by

include/asm-m68k/module.h +1 -0

diff -urN linux-2.4.0t11p7/include/asm-m68k/module.h linux/include/asm-m68k/module.h
@@ -7,5 +7,6 @@
 #define module_map(x)		vmalloc(x)
 #define module_unmap(x)		vfree(x)
 #define module_arch_init(x)	(0)
+#define arch_init_modules()	do { } while (0)
 
 #endif /* _ASM_M68K_MODULE_H */

include/asm-mips/module.h +1 -0

diff -urN linux-2.4.0t11p7/include/asm-mips/module.h linux/include/asm-mips/module.h
@@ -7,5 +7,6 @@
 #define module_map(x)		vmalloc(x)
 #define module_unmap(x)		vfree(x)
 #define module_arch_init(x)	(0)
+#define arch_init_modules()	do { } while (0)
 
 #endif /* _ASM_MIPS_MODULE_H */

include/asm-mips64/module.h +1 -0

diff -urN linux-2.4.0t11p7/include/asm-mips64/module.h linux/include/asm-mips64/module.h
@@ -7,5 +7,6 @@
 #define module_map(x)		vmalloc(x)
 #define module_unmap(x)		vfree(x)
 #define module_arch_init(x)	(0)
+#define arch_init_modules()	do { } while (0)
 
 #endif /* _ASM_MIPS64_MODULE_H */

include/asm-ppc/module.h +1 -0

diff -urN linux-2.4.0t11p7/include/asm-ppc/module.h linux/include/asm-ppc/module.h
@@ -7,5 +7,6 @@
 #define module_map(x)		vmalloc(x)
 #define module_unmap(x)		vfree(x)
 #define module_arch_init(x)	(0)
+#define arch_init_modules()	do { } while (0)
 
 #endif /* _ASM_PPC_MODULE_H */

include/asm-s390/module.h +1 -0

diff -urN linux-2.4.0t11p7/include/asm-s390/module.h linux/include/asm-s390/module.h
@@ -7,5 +7,6 @@
 #define module_map(x)		vmalloc(x)
 #define module_unmap(x)		vfree(x)
 #define module_arch_init(x)	(0)
+#define arch_init_modules()	do { } while (0)
 
 #endif /* _ASM_S390_MODULE_H */

include/asm-sh/module.h +1 -0

diff -urN linux-2.4.0t11p7/include/asm-sh/module.h linux/include/asm-sh/module.h
@@ -7,5 +7,6 @@
 #define module_map(x)		vmalloc(x)
 #define module_unmap(x)		vfree(x)
 #define module_arch_init(x)	(0)
+#define arch_init_modules()	do { } while (0)
 
 #endif /* _ASM_SH_MODULE_H */

include/asm-sparc/module.h +1 -0

diff -urN linux-2.4.0t11p7/include/asm-sparc/module.h linux/include/asm-sparc/module.h
@@ -7,5 +7,6 @@
 #define module_map(x)		vmalloc(x)
 #define module_unmap(x)		vfree(x)
 #define module_arch_init(x)	(0)
+#define arch_init_modules()	do { } while (0)
 
 #endif /* _ASM_SPARC_MODULE_H */

include/asm-sparc64/module.h +1 -0

diff -urN linux-2.4.0t11p7/include/asm-sparc64/module.h linux/include/asm-sparc64/module.h
@@ -7,5 +7,6 @@
 extern void * module_map (unsigned long size);
 extern void module_unmap (void *addr);
 #define module_arch_init(x)	(0)
+#define arch_init_modules()	do { } while (0)
 
 #endif /* _ASM_SPARC64_MODULE_H */

kernel/module.c +1 -4

diff -urN linux-2.4.0t11p7/kernel/module.c linux/kernel/module.c
@@ -230,10 +230,7 @@
 void __init init_modules(void)
 {
 	kernel_module.nsyms = __stop___ksymtab - __start___ksymtab;
-
-#ifdef __alpha__
-	__asm__("stq $29,%0" : "=m"(kernel_module.gp));
-#endif
+	arch_init_modules();
 }
 
 /*

include/linux/module.h +2 -2

diff -urN linux-2.4.0t11p7/include/linux/module.h linux/include/linux/module.h
@@ -182,8 +182,6 @@
 	const void *userdata;
 };
 
-extern int try_inc_mod_count(struct module *mod);
-
 #if defined(MODULE) && !defined(__GENKSYMS__)
 
 /* Embedded module documentation macros.  */

@@ -345,8 +343,10 @@
 #endif /* MODULE */
 
 #ifdef CONFIG_MODULES
+extern int try_inc_mod_count(struct module *mod);
 #define SET_MODULE_OWNER(some_struct) do { some_struct->owner = THIS_MODULE; } while (0)
 #else
+static inline int try_inc_mod_count(struct module *mod) { return 1; }
 #define SET_MODULE_OWNER(some_struct) do { } while (0)
 #endif

kernel/module.c +0 -5

diff -urN linux-2.4.0t11p7/kernel/module.c linux/kernel/module.c
@@ -1222,9 +1222,4 @@
 	return -ENOSYS;
 }
 
-int try_inc_mod_count(struct module *mod)
-{
-	return 1;
-}
-
 #endif	/* CONFIG_MODULES */

include/linux/module.h +9 ~~-14~~

diff -urN linux-2.4.0t11p7/include/linux/module.h linux/include/linux/module.h
@@ -190,19 +190,18 @@
 
 /* For documentation purposes only.  */
 
+#define __modinfo __attribute__((section(".modinfo")))
+
 #define MODULE_AUTHOR(name)						   \
-const char __module_author[] __attribute__((section(".modinfo"))) = 	   \
-"author=" name
+const char __module_author[] __modinfo = "author=" name
 
 #define MODULE_DESCRIPTION(desc)					   \
-const char __module_description[] __attribute__((section(".modinfo"))) =   \
-"description=" desc
+const char __module_description[] __modinfo = "description=" desc
 
 /* Could potentially be used by kmod...  */
 
 #define MODULE_SUPPORTED_DEVICE(dev)					   \
-const char __module_device[] __attribute__((section(".modinfo"))) = 	   \
-"device=" dev
+const char __module_device[] __modinfo = "device=" dev
 
 /* Used to verify parameters given to the module.  The TYPE arg should
    be a string in the following format:

@@ -219,13 +218,11 @@
 
 #define MODULE_PARM(var,type)			\
 const char __module_parm_##var[]		\
-__attribute__((section(".modinfo"))) =		\
-"parm_" __MODULE_STRING(var) "=" type
+__modinfo = "parm_" __MODULE_STRING(var) "=" type
 
 #define MODULE_PARM_DESC(var,desc)		\
 const char __module_parm_desc_##var[]		\
-__attribute__((section(".modinfo"))) =		\
-"parm_desc_" __MODULE_STRING(var) "=" desc
+__modinfo = "parm_desc_" __MODULE_STRING(var) "=" desc
 
 /*
  * MODULE_DEVICE_TABLE exports information about devices

@@ -263,11 +260,9 @@
 #define MOD_IN_USE		__MOD_IN_USE(THIS_MODULE)
 
 #include <linux/version.h>
-static const char __module_kernel_version[] __attribute__((section(".modinfo"))) =
-"kernel_version=" UTS_RELEASE;
+static const char __module_kernel_version[] __modinfo = "kernel_version=" UTS_RELEASE;
 #ifdef MODVERSIONS
-static const char __module_using_checksums[] __attribute__((section(".modinfo"))) =
-"using_checksums=1";
+static const char __module_using_checksums[] __modinfo = "using_checksums=1";
 #endif
 
 #else /* MODULE */