diff -urN linux-2.4.0t11p7/include/linux/module.h linux/include/linux/module.h --- linux-2.4.0t11p7/include/linux/module.h Sat Nov 18 12:14:43 2000 +++ linux/include/linux/module.h Sat Nov 18 12:38:16 2000 @@ -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 -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 */