@@ -109,19 +109,13 @@ extern struct uml_param __uml_setup_start, __uml_setup_end;
#ifdef __UM_HOST__
-#define __define_initcall(level,fn) \
- static initcall_t __initcall_##fn __used \
- __attribute__((__section__(".initcall" level ".init"))) = fn
-
-/* Userspace initcalls shouldn't depend on anything in the kernel, so we'll
- * make them run first.
- */
-#define __initcall(fn) __define_initcall("1", fn)
+#undef __uml_exit_call
+#define __uml_exit_call __used __section(os_exitcalls)
+#define __init_call __used __section(os_initcalls)
+#define __initcall(fn) static initcall_t __initcall_##fn __init_call = fn
#define __exitcall(fn) static exitcall_t __exitcall_##fn __exit_call = fn
-#define __init_call __used __section(.initcall.init)
-
#endif
#endif /* _LINUX_UML_INIT_H */
@@ -35,10 +35,15 @@ static void kill_off_processes(void)
read_unlock(&tasklist_lock);
}
+void __weak os_exitcalls(void)
+{
+}
+
void uml_cleanup(void)
{
kmalloc_ok = 0;
do_uml_exitcalls();
+ os_exitcalls();
kill_off_processes();
}
@@ -377,3 +377,14 @@ void *text_poke(void *addr, const void *opcode, size_t len)
void text_poke_sync(void)
{
}
+
+int __weak os_initcalls(void)
+{
+ return 0;
+}
+
+int __init run_os_initcalls(void)
+{
+ return os_initcalls();
+}
+early_initcall(run_os_initcalls);