Commit a77c1764 authored by Jeff Garzik's avatar Jeff Garzik

Macro __devexit_p in linux/init.h needs to be conditions on both

MODULE and CONFIG_HOTPLUG cpp symbols.  Merge 2.4's definition to
make it so.
parent 35aa61ec
...@@ -177,13 +177,23 @@ typedef void (*__cleanup_module_func_t)(void); ...@@ -177,13 +177,23 @@ typedef void (*__cleanup_module_func_t)(void);
#define __devinitdata #define __devinitdata
#define __devexit #define __devexit
#define __devexitdata #define __devexitdata
#define __devexit_p(x) &(x)
#else #else
#define __devinit __init #define __devinit __init
#define __devinitdata __initdata #define __devinitdata __initdata
#define __devexit __exit #define __devexit __exit
#define __devexitdata __exitdata #define __devexitdata __exitdata
#define __devexit_p(x) 0 #endif
/* Functions marked as __devexit may be discarded at kernel link time, depending
on config options. Newer versions of binutils detect references from
retained sections to discarded sections and flag an error. Pointers to
__devexit functions must use __devexit_p(function_name), the wrapper will
insert either the function_name or NULL, depending on the config options.
*/
#if defined(MODULE) || defined(CONFIG_HOTPLUG)
#define __devexit_p(x) x
#else
#define __devexit_p(x) NULL
#endif #endif
#endif /* _LINUX_INIT_H */ #endif /* _LINUX_INIT_H */
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