diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 8 | ||||
-rw-r--r-- | init/main.c | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/init/Kconfig b/init/Kconfig index 46f817abff0e..69886493ff1e 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -55,6 +55,7 @@ config CROSS_COMPILE config COMPILE_TEST bool "Compile also drivers which will not load" + depends on !UML default n help Some drivers can be compiled on a different platform than they are @@ -80,6 +81,7 @@ config LOCALVERSION config LOCALVERSION_AUTO bool "Automatically append version information to the version string" default y + depends on !COMPILE_TEST help This will try to automatically determine if the current tree is a release tree by looking for git tags that belong to the current @@ -952,7 +954,7 @@ menuconfig CGROUPS controls or device isolation. See - Documentation/scheduler/sched-design-CFS.txt (CFS) - - Documentation/cgroups/ (features for grouping, isolation + - Documentation/cgroup-v1/ (features for grouping, isolation and resource control) Say N if unsure. @@ -1009,7 +1011,7 @@ config BLK_CGROUP CONFIG_CFQ_GROUP_IOSCHED=y; for enabling throttling policy, set CONFIG_BLK_DEV_THROTTLING=y. - See Documentation/cgroups/blkio-controller.txt for more information. + See Documentation/cgroup-v1/blkio-controller.txt for more information. config DEBUG_BLK_CGROUP bool "IO controller debugging" @@ -2078,7 +2080,7 @@ config TRIM_UNUSED_KSYMS (especially when using LTO) for optimizing the code and reducing binary size. This might have some security advantages as well. - If unsure say N. + If unsure, or if you need to build out-of-tree modules, say N. endif # MODULES diff --git a/init/main.c b/init/main.c index eae02aa03c9e..a8a58e2794a5 100644 --- a/init/main.c +++ b/init/main.c @@ -380,7 +380,7 @@ static void __init setup_command_line(char *command_line) static __initdata DECLARE_COMPLETION(kthreadd_done); -static noinline void __init_refok rest_init(void) +static noinline void __ref rest_init(void) { int pid; @@ -716,6 +716,12 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn) addr = (unsigned long) dereference_function_descriptor(fn); sprint_symbol_no_offset(fn_name, addr); + /* + * fn will be "function_name [module_name]" where [module_name] is not + * displayed for built-in init functions. Strip off the [module_name]. + */ + strreplace(fn_name, ' ', '\0'); + list_for_each_entry(entry, &blacklisted_initcalls, next) { if (!strcmp(fn_name, entry->buf)) { pr_debug("initcall %s blacklisted\n", fn_name); |