Commit 5c0f111c authored by Rusty Russell's avatar Rusty Russell Committed by Linus Torvalds

[PATCH] module device table restoration

Patch from Adam Richter.  I have a nicer solution based on aliases, but
it requires coordination with USB, PCI and PCMCIA maintainers, which is
taking time.

This restores the old code in the meantime: one week without this is too
long for people who need it.
parent 8f79cdb7
...@@ -28,8 +28,6 @@ ...@@ -28,8 +28,6 @@
#define MODULE_AUTHOR(name) #define MODULE_AUTHOR(name)
#define MODULE_DESCRIPTION(desc) #define MODULE_DESCRIPTION(desc)
#define MODULE_SUPPORTED_DEVICE(name) #define MODULE_SUPPORTED_DEVICE(name)
#define MODULE_GENERIC_TABLE(gtype,name)
#define MODULE_DEVICE_TABLE(type,name)
#define MODULE_PARM_DESC(var,desc) #define MODULE_PARM_DESC(var,desc)
#define print_modules() #define print_modules()
...@@ -41,14 +39,28 @@ struct kernel_symbol ...@@ -41,14 +39,28 @@ struct kernel_symbol
}; };
#ifdef MODULE #ifdef MODULE
#define MODULE_GENERIC_TABLE(gtype,name) \
static const unsigned long __module_##gtype##_size \
__attribute__ ((unused)) = sizeof(struct gtype##_id); \
static const struct gtype##_id * __module_##gtype##_table \
__attribute__ ((unused)) = name
/* This is magically filled in by the linker, but THIS_MODULE must be /* This is magically filled in by the linker, but THIS_MODULE must be
a constant so it works in initializers. */ a constant so it works in initializers. */
extern struct module __this_module; extern struct module __this_module;
#define THIS_MODULE (&__this_module) #define THIS_MODULE (&__this_module)
#else
#else /* !MODULE */
#define MODULE_GENERIC_TABLE(gtype,name)
#define THIS_MODULE ((struct module *)0) #define THIS_MODULE ((struct module *)0)
#endif #endif
#define MODULE_DEVICE_TABLE(type,name) \
MODULE_GENERIC_TABLE(type##_device,name)
struct kernel_symbol_group struct kernel_symbol_group
{ {
/* Links us into the global symbol list */ /* Links us into the global symbol list */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment