diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-04 09:59:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-04 09:59:13 +0200 |
| commit | fafd883f671dfc1c2f62009179920f27abc784a1 (patch) | |
| tree | 0eccb0baf343cad79a54e352598921db9ca17620 /include/linux/init.h | |
| parent | 92519bbc8af612975410def52bd462ca9af85cdb (diff) | |
| parent | d8b11a0cbd1c66ce283eb9dabe0498dfa6483f32 (diff) | |
Merge branch 'perf/urgent' into perf/core
Pick up the latest fixes before applying new patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/init.h')
| -rw-r--r-- | include/linux/init.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index e73f2b708525..f1c27a71d03c 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -153,6 +153,7 @@ extern unsigned int reset_devices; void setup_arch(char **); void prepare_namespace(void); void __init load_default_modules(void); +int __init init_rootfs(void); extern void (*late_time_init)(void); |