diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 6 | ||||
-rw-r--r-- | init/main.c | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/init/Kconfig b/init/Kconfig index 15f73066aada..ce75d2dff948 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -919,12 +919,6 @@ config MODULE_SRCVERSION_ALL the version). With this option, such a "srcversion" field will be created for all modules. If unsure, say N. -config KMOD - def_bool y - help - This is being removed soon. These days, CONFIG_MODULES - implies CONFIG_KMOD, so use that instead. - endif # MODULES config INIT_ALL_POSSIBLE diff --git a/init/main.c b/init/main.c index 59414b5cf40d..5a819ac2b696 100644 --- a/init/main.c +++ b/init/main.c @@ -528,9 +528,9 @@ static void __init boot_cpu_init(void) { int cpu = smp_processor_id(); /* Mark the boot cpu "present", "online" etc for SMP and UP case */ - cpu_set(cpu, cpu_online_map); - cpu_set(cpu, cpu_present_map); - cpu_set(cpu, cpu_possible_map); + set_cpu_online(cpu, true); + set_cpu_present(cpu, true); + set_cpu_possible(cpu, true); } void __init __weak smp_setup_processor_id(void) |