diff options
| -rw-r--r-- | include/linux/init.h | 3 | ||||
| -rw-r--r-- | init/main.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index 6b951095a42f..5e664f671615 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
| @@ -191,6 +191,7 @@ extern bool initcall_debug; | |||
| 191 | * initializes variables that couldn't be statically initialized. | 191 | * initializes variables that couldn't be statically initialized. |
| 192 | * | 192 | * |
| 193 | * This only exists for built-in code, not for modules. | 193 | * This only exists for built-in code, not for modules. |
| 194 | * Keep main.c:initcall_level_names[] in sync. | ||
| 194 | */ | 195 | */ |
| 195 | #define pure_initcall(fn) __define_initcall("0",fn,0) | 196 | #define pure_initcall(fn) __define_initcall("0",fn,0) |
| 196 | 197 | ||
| @@ -280,7 +281,7 @@ void __init parse_early_options(char *cmdline); | |||
| 280 | 281 | ||
| 281 | #else /* MODULE */ | 282 | #else /* MODULE */ |
| 282 | 283 | ||
| 283 | /* Don't use these in modules, but some people do... */ | 284 | /* Don't use these in loadable modules, but some people do... */ |
| 284 | #define early_initcall(fn) module_init(fn) | 285 | #define early_initcall(fn) module_init(fn) |
| 285 | #define core_initcall(fn) module_init(fn) | 286 | #define core_initcall(fn) module_init(fn) |
| 286 | #define postcore_initcall(fn) module_init(fn) | 287 | #define postcore_initcall(fn) module_init(fn) |
diff --git a/init/main.c b/init/main.c index b5cc0a7c4708..7a740870ffe3 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -724,6 +724,7 @@ static initcall_t *initcall_levels[] __initdata = { | |||
| 724 | __initcall_end, | 724 | __initcall_end, |
| 725 | }; | 725 | }; |
| 726 | 726 | ||
| 727 | /* Keep these in sync with initcalls in include/linux/init.h */ | ||
| 727 | static char *initcall_level_names[] __initdata = { | 728 | static char *initcall_level_names[] __initdata = { |
| 728 | "early", | 729 | "early", |
| 729 | "core", | 730 | "core", |
