aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c25
1 files changed, 10 insertions, 15 deletions
diff --git a/init/main.c b/init/main.c
index 4051d75dd2d6..dac44a9356a5 100644
--- a/init/main.c
+++ b/init/main.c
@@ -369,12 +369,6 @@ static void __init smp_init(void)
369{ 369{
370 unsigned int cpu; 370 unsigned int cpu;
371 371
372 /*
373 * Set up the current CPU as possible to migrate to.
374 * The other ones will be done by cpu_up/cpu_down()
375 */
376 set_cpu_active(smp_processor_id(), true);
377
378 /* FIXME: This should be done in userspace --RR */ 372 /* FIXME: This should be done in userspace --RR */
379 for_each_present_cpu(cpu) { 373 for_each_present_cpu(cpu) {
380 if (num_online_cpus() >= setup_max_cpus) 374 if (num_online_cpus() >= setup_max_cpus)
@@ -486,6 +480,7 @@ static void __init boot_cpu_init(void)
486 int cpu = smp_processor_id(); 480 int cpu = smp_processor_id();
487 /* Mark the boot cpu "present", "online" etc for SMP and UP case */ 481 /* Mark the boot cpu "present", "online" etc for SMP and UP case */
488 set_cpu_online(cpu, true); 482 set_cpu_online(cpu, true);
483 set_cpu_active(cpu, true);
489 set_cpu_present(cpu, true); 484 set_cpu_present(cpu, true);
490 set_cpu_possible(cpu, true); 485 set_cpu_possible(cpu, true);
491} 486}
@@ -691,10 +686,10 @@ asmlinkage void __init start_kernel(void)
691static void __init do_ctors(void) 686static void __init do_ctors(void)
692{ 687{
693#ifdef CONFIG_CONSTRUCTORS 688#ifdef CONFIG_CONSTRUCTORS
694 ctor_fn_t *call = (ctor_fn_t *) __ctors_start; 689 ctor_fn_t *fn = (ctor_fn_t *) __ctors_start;
695 690
696 for (; call < (ctor_fn_t *) __ctors_end; call++) 691 for (; fn < (ctor_fn_t *) __ctors_end; fn++)
697 (*call)(); 692 (*fn)();
698#endif 693#endif
699} 694}
700 695
@@ -755,10 +750,10 @@ extern initcall_t __initcall_start[], __initcall_end[], __early_initcall_end[];
755 750
756static void __init do_initcalls(void) 751static void __init do_initcalls(void)
757{ 752{
758 initcall_t *call; 753 initcall_t *fn;
759 754
760 for (call = __early_initcall_end; call < __initcall_end; call++) 755 for (fn = __early_initcall_end; fn < __initcall_end; fn++)
761 do_one_initcall(*call); 756 do_one_initcall(*fn);
762 757
763 /* Make sure there is no pending stuff from the initcall sequence */ 758 /* Make sure there is no pending stuff from the initcall sequence */
764 flush_scheduled_work(); 759 flush_scheduled_work();
@@ -785,10 +780,10 @@ static void __init do_basic_setup(void)
785 780
786static void __init do_pre_smp_initcalls(void) 781static void __init do_pre_smp_initcalls(void)
787{ 782{
788 initcall_t *call; 783 initcall_t *fn;
789 784
790 for (call = __initcall_start; call < __early_initcall_end; call++) 785 for (fn = __initcall_start; fn < __early_initcall_end; fn++)
791 do_one_initcall(*call); 786 do_one_initcall(*fn);
792} 787}
793 788
794static void run_init_process(char *init_filename) 789static void run_init_process(char *init_filename)