* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits) sched: Fix broken assertion sched: Assert task state bits at build time sched: Update task_state_arraypwith new states sched: Add missing state chars to TASK_STATE_TO_CHAR_STR sched: Move TASK_STATE_TO_CHAR_STR near the TASK_state bits sched: Teach might_sleep() about preemptible RCU sched: Make warning less noisy sched: Simplify set_task_cpu() sched: Remove the cfs_rq dependency from set_task_cpu() sched: Add pre and post wakeup hooks sched: Move kthread_bind() back to kthread.c sched: Fix select_task_rq() vs hotplug issues sched: Fix sched_exec() balancing sched: Ensure set_task_cpu() is never called on blocked tasks sched: Use TASK_WAKING for fork wakups sched: Select_task_rq_fair() must honour SD_LOAD_BALANCE sched: Fix task_hot() test order sched: Fix set_cpu_active() in cpu_down() sched: Mark boot-cpu active before smp_init() sched: Fix cpu_clock() in NMIs, on !CONFIG_HAVE_UNSTABLE_SCHED_CLOCK ...
Showing the changes to init (1 of 12 files). Show all
Unified · Split
| @@ -369,12 +369,6 @@ static void __init smp_init(void) · 368 unmodified lines | ||
| 369 | 369 | { |
| 370 | 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 | 372 | /* FIXME: This should be done in userspace --RR */ |
| 379 | 373 | for_each_present_cpu(cpu) { |
| 380 | 374 | if (num_online_cpus() >= setup_max_cpus) |
| @@ -486,6 +480,7 @@ static void __init boot_cpu_init(void) · 105 unmodified lines | ||
| 486 | 480 | int cpu = smp_processor_id(); |
| 487 | 481 | /* Mark the boot cpu "present", "online" etc for SMP and UP case */ |
| 488 | 482 | set_cpu_online(cpu, true); |
| 483 | + set_cpu_active(cpu, true); | |
| 489 | 484 | set_cpu_present(cpu, true); |
| 490 | 485 | set_cpu_possible(cpu, true); |
| 491 | 486 | } |