diff options
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c index 6bf83afd654d..d6b388fbffa6 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -407,8 +407,7 @@ static void __init smp_init(void) | |||
407 | * Set up the current CPU as possible to migrate to. | 407 | * Set up the current CPU as possible to migrate to. |
408 | * The other ones will be done by cpu_up/cpu_down() | 408 | * The other ones will be done by cpu_up/cpu_down() |
409 | */ | 409 | */ |
410 | cpu = smp_processor_id(); | 410 | set_cpu_active(smp_processor_id(), true); |
411 | cpu_set(cpu, cpu_active_map); | ||
412 | 411 | ||
413 | /* FIXME: This should be done in userspace --RR */ | 412 | /* FIXME: This should be done in userspace --RR */ |
414 | for_each_present_cpu(cpu) { | 413 | for_each_present_cpu(cpu) { |
@@ -842,7 +841,7 @@ static int __init kernel_init(void * unused) | |||
842 | /* | 841 | /* |
843 | * init can run on any cpu. | 842 | * init can run on any cpu. |
844 | */ | 843 | */ |
845 | set_cpus_allowed_ptr(current, CPU_MASK_ALL_PTR); | 844 | set_cpus_allowed_ptr(current, cpu_all_mask); |
846 | /* | 845 | /* |
847 | * Tell the world that we're going to be the grim | 846 | * Tell the world that we're going to be the grim |
848 | * reaper of innocent orphaned children. | 847 | * reaper of innocent orphaned children. |