Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

[linux-2.6-omap-h63xx.git] / arch / um / include / init.h

diff --git a/arch/um/include/init.h b/arch/um/include/init.h
index 55c2693f877827abab61514a648c8ee20ce7d98b..d4de7c0120ced888209122f47424d9754c1ed50f 100644 (file)
--- a/arch/um/include/init.h
+++ b/arch/um/include/init.h
@@ -111,10 +111,18 @@ extern struct uml_param __uml_setup_start, __uml_setup_end;
 
 #ifndef __KERNEL__
 
-#define __initcall(fn) static initcall_t __initcall_##fn __init_call = fn
+#define __define_initcall(level,fn) \
+       static initcall_t __initcall_##fn __attribute_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)
+
 #define __exitcall(fn) static exitcall_t __exitcall_##fn __exit_call = fn
 
-#define __init_call __attribute__ ((unused,__section__ (".initcall.init")))
+#define __init_call    __attribute_used__ __attribute__ ((__section__ (".initcall.init")))
 
 #endif