Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-drm-fsl-dcu.git] / include / linux / init.h

diff --git a/include/linux/init.h b/include/linux/init.h
index 6667785dd1ff22d7452b716b380e7475158ee8b9..c65f5107d512c4a2df0e3373616772849c9e383b 100644 (file)
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -68,6 +68,7 @@ extern initcall_t __security_initcall_start[], __security_initcall_end[];
 
 /* Defined in init/main.c */
 extern char saved_command_line[];
+extern unsigned int reset_devices;
 
 /* used by init/main.c */
 extern void setup_arch(char **);
@@ -83,19 +84,38 @@ extern void setup_arch(char **);
  * by link order. 
  * For backwards compatibility, initcall() puts the call in 
  * the device init subsection.
+ *
+ * The `id' arg to __define_initcall() is needed so that multiple initcalls
+ * can point at the same handler without causing duplicate-symbol build errors.
  */
 
-#define __define_initcall(level,fn) \
-       static initcall_t __initcall_##fn __attribute_used__ \
+#define __define_initcall(level,fn,id) \
+       static initcall_t __initcall_##fn##id __attribute_used__ \
        __attribute__((__section__(".initcall" level ".init"))) = fn
 
-#define core_initcall(fn)              __define_initcall("1",fn)
-#define postcore_initcall(fn)          __define_initcall("2",fn)
-#define arch_initcall(fn)              __define_initcall("3",fn)
-#define subsys_initcall(fn)            __define_initcall("4",fn)
-#define fs_initcall(fn)                        __define_initcall("5",fn)
-#define device_initcall(fn)            __define_initcall("6",fn)
-#define late_initcall(fn)              __define_initcall("7",fn)
+/*
+ * A "pure" initcall has no dependencies on anything else, and purely
+ * initializes variables that couldn't be statically initialized.
+ *
+ * This only exists for built-in code, not for modules.
+ */
+#define pure_initcall(fn)              __define_initcall("0",fn,1)
+
+#define core_initcall(fn)              __define_initcall("1",fn,1)
+#define core_initcall_sync(fn)         __define_initcall("1s",fn,1s)
+#define postcore_initcall(fn)          __define_initcall("2",fn,2)
+#define postcore_initcall_sync(fn)     __define_initcall("2s",fn,2s)
+#define arch_initcall(fn)              __define_initcall("3",fn,3)
+#define arch_initcall_sync(fn)         __define_initcall("3s",fn,3s)
+#define subsys_initcall(fn)            __define_initcall("4",fn,4)
+#define subsys_initcall_sync(fn)       __define_initcall("4s",fn,4s)
+#define fs_initcall(fn)                        __define_initcall("5",fn,5)
+#define fs_initcall_sync(fn)           __define_initcall("5s",fn,5s)
+#define rootfs_initcall(fn)            __define_initcall("rootfs",fn,rootfs)
+#define device_initcall(fn)            __define_initcall("6",fn,6)
+#define device_initcall_sync(fn)       __define_initcall("6s",fn,6s)
+#define late_initcall(fn)              __define_initcall("7",fn,7)
+#define late_initcall_sync(fn)         __define_initcall("7s",fn,7s)
 
 #define __initcall(fn) device_initcall(fn)
 
@@ -152,7 +172,7 @@ void __init parse_early_param(void);
  * module_init() - driver initialization entry point
  * @x: function to be run at kernel boot time or module insertion
  * 
- * module_init() will either be called during do_initcalls (if
+ * module_init() will either be called during do_initcalls() (if
  * builtin) or at module insertion time (if a module).  There can only
  * be one per module.
  */