UML has his own initcall mechanism to handle his special userspace
initialization (they are called in different moments, so they are indeed
different).
It must also duplicate some definition for the benefit of userspace code - but
those definition weren't in sync with the main code. Also, the UML own macros
missed __attribute_used__. Both problems are fixed by this patch.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[email protected]>
---
linux-2.6.11-paolo/arch/um/include/init.h | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff -puN arch/um/include/init.h~uml-init_h-fix arch/um/include/init.h
--- linux-2.6.11/arch/um/include/init.h~uml-init_h-fix 2005-01-13 02:55:49.051805472 +0100
+++ linux-2.6.11-paolo/arch/um/include/init.h 2005-01-13 02:55:49.088799848 +0100
@@ -40,9 +40,18 @@
typedef int (*initcall_t)(void);
typedef void (*exitcall_t)(void);
-#define __init __attribute__ ((__section__ (".text.init")))
-#define __exit __attribute__ ((unused, __section__(".text.exit")))
-#define __initdata __attribute__ ((__section__ (".data.init")))
+/* These are for everybody (although not all archs will actually
+ discard it in modules) */
+#define __init __attribute__ ((__section__ (".init.text")))
+#define __initdata __attribute__ ((__section__ (".init.data")))
+#define __exitdata __attribute__ ((__section__(".exit.data")))
+#define __exit_call __attribute_used__ __attribute__ ((__section__ (".exitcall.exit")))
+
+#ifdef MODULE
+#define __exit __attribute__ ((__section__(".exit.text")))
+#else
+#define __exit __attribute_used__ __attribute__ ((__section__(".exit.text")))
+#endif
#endif
@@ -94,11 +103,11 @@ extern struct uml_param __uml_setup_star
* Mark functions and data as being only used at initialization
* or exit time.
*/
-#define __uml_init_setup __attribute__ ((unused,__section__ (".uml.setup.init")))
-#define __uml_setup_help __attribute__ ((unused,__section__ (".uml.help.init")))
-#define __uml_init_call __attribute__ ((unused,__section__ (".uml.initcall.init")))
-#define __uml_postsetup_call __attribute__ ((unused,__section__ (".uml.postsetup.init")))
-#define __uml_exit_call __attribute__ ((unused,__section__ (".uml.exitcall.exit")))
+#define __uml_init_setup __attribute_used__ __attribute__ ((__section__ (".uml.setup.init")))
+#define __uml_setup_help __attribute_used__ __attribute__ ((__section__ (".uml.help.init")))
+#define __uml_init_call __attribute_used__ __attribute__ ((__section__ (".uml.initcall.init")))
+#define __uml_postsetup_call __attribute_used__ __attribute__ ((__section__ (".uml.postsetup.init")))
+#define __uml_exit_call __attribute_used__ __attribute__ ((__section__ (".uml.exitcall.exit")))
#endif /* _LINUX_UML_INIT_H */
_