diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-09-04 17:08:02 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-09-04 17:08:02 +1000 |
| commit | ce2587a30eb784688b5d33008477ba6cb13394bf (patch) | |
| tree | f9f3d8d8c5c7cd69a0d626acae87021a671b6b23 /include | |
| parent | ee702fa93e5db50aab07adee3feab65e819c40f0 (diff) | |
| parent | 696f6d1d5c92a52d05ba739cb55358090ded5af6 (diff) | |
Merge commit 'fastboot/auto-fastboot-next'
Conflicts:
include/linux/init.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 6 | ||||
| -rw-r--r-- | include/linux/init.h | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 63709a5ec3c0..4f3558232c10 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -396,8 +396,12 @@ *(.initcall5.init) \ *(.initcall5s.init) \ *(.initcallrootfs.init) \ + *(.initcall6s.init) \ + __async_initcall_start = .; \ + *(.initcall6a.init) \ + __async_initcall_end = .; \ *(.initcall6.init) \ - *(.initcall6s.init) \ + __device_initcall_end = .; \ *(.initcall7.init) \ *(.initcall7s.init) diff --git a/include/linux/init.h b/include/linux/init.h index ac329cbe8812..0e45190f6572 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -144,6 +144,8 @@ extern char __initdata boot_command_line[]; extern char *saved_command_line; extern unsigned int reset_devices; extern int initmem_now_dynamic; +extern int do_one_initcall(initcall_t fn); + /* used by init/main.c */ void setup_arch(char **); @@ -198,11 +200,13 @@ extern void (*late_time_init)(void); #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_async(fn) __define_initcall("6a", fn, 6a) #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) +#define __initcall_async(fn) device_initcall_async(fn) #define __exitcall(fn) \ static exitcall_t __exitcall_##fn __exit_call = fn @@ -258,6 +262,7 @@ void __init parse_early_param(void); * be one per module. */ #define module_init(x) __initcall(x); +#define module_init_async(x) __initcall_async(x); /** * module_exit() - driver exit entry point @@ -280,10 +285,13 @@ void __init parse_early_param(void); #define subsys_initcall(fn) module_init(fn) #define fs_initcall(fn) module_init(fn) #define device_initcall(fn) module_init(fn) +#define device_initcall_async(fn) module_init(fn) #define late_initcall(fn) module_init(fn) #define security_initcall(fn) module_init(fn) +#define module_init_async(fn) module_init(fn) + /* Each module must use one module_init(). */ #define module_init(initfn) \ static inline initcall_t __inittest(void) \ |