diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-01-06 05:02:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-01-06 05:02:29 -0500 |
| commit | 567bee2803cb46caeb6011de5b738fde33dc3896 (patch) | |
| tree | 05bab01377bffa356bfbe06c4b6193b23b7c24ca /kernel/stop_machine.c | |
| parent | aa0b7ae06387d40a988ce16a189082dee6e570bc (diff) | |
| parent | 093e5840ae76f1082633503964d035f40ed0216d (diff) | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes before merging new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/stop_machine.c')
| -rw-r--r-- | kernel/stop_machine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index 61101193967e..edb6de4f5908 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c | |||
| @@ -529,7 +529,7 @@ static int __init cpu_stop_init(void) | |||
| 529 | } | 529 | } |
| 530 | early_initcall(cpu_stop_init); | 530 | early_initcall(cpu_stop_init); |
| 531 | 531 | ||
| 532 | #ifdef CONFIG_STOP_MACHINE | 532 | #if defined(CONFIG_SMP) || defined(CONFIG_HOTPLUG_CPU) |
| 533 | 533 | ||
| 534 | static int __stop_machine(cpu_stop_fn_t fn, void *data, const struct cpumask *cpus) | 534 | static int __stop_machine(cpu_stop_fn_t fn, void *data, const struct cpumask *cpus) |
| 535 | { | 535 | { |
| @@ -629,4 +629,4 @@ int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data, | |||
| 629 | return ret ?: done.ret; | 629 | return ret ?: done.ret; |
| 630 | } | 630 | } |
| 631 | 631 | ||
| 632 | #endif /* CONFIG_STOP_MACHINE */ | 632 | #endif /* CONFIG_SMP || CONFIG_HOTPLUG_CPU */ |