projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[linux-drm-fsl-dcu.git]
/
kernel
/
cpu.c
diff --git
a/kernel/cpu.c
b/kernel/cpu.c
index 272254f20d9744b4844cde0c6da1dc13210283c4..3d4206ada5c9d970c0806348a75424f30f7adbac 100644
(file)
--- a/
kernel/cpu.c
+++ b/
kernel/cpu.c
@@
-204,7
+204,7
@@
int cpu_down(unsigned int cpu)
#endif /*CONFIG_HOTPLUG_CPU*/
/* Requires cpu_add_remove_lock to be held */
#endif /*CONFIG_HOTPLUG_CPU*/
/* Requires cpu_add_remove_lock to be held */
-static int __
dev
init _cpu_up(unsigned int cpu)
+static int __
cpu
init _cpu_up(unsigned int cpu)
{
int ret;
void *hcpu = (void *)(long)cpu;
{
int ret;
void *hcpu = (void *)(long)cpu;
@@
-239,7
+239,7
@@
out_notify:
return ret;
}
return ret;
}
-int __
dev
init cpu_up(unsigned int cpu)
+int __
cpu
init cpu_up(unsigned int cpu)
{
int err = 0;
{
int err = 0;
@@
-258,7
+258,7
@@
static cpumask_t frozen_cpus;
int disable_nonboot_cpus(void)
{
int disable_nonboot_cpus(void)
{
- int cpu, first_cpu, error;
+ int cpu, first_cpu, error
= 0
;
mutex_lock(&cpu_add_remove_lock);
first_cpu = first_cpu(cpu_present_map);
mutex_lock(&cpu_add_remove_lock);
first_cpu = first_cpu(cpu_present_map);
@@
-270,11
+270,7
@@
int disable_nonboot_cpus(void)
goto out;
}
}
goto out;
}
}
- error = set_cpus_allowed(current, cpumask_of_cpu(first_cpu));
- if (error) {
- printk(KERN_ERR "Could not run on CPU%d\n", first_cpu);
- goto out;
- }
+
/* We take down all of the non-boot CPUs in one shot to avoid races
* with the userspace trying to use the CPU hotplug at the same time
*/
/* We take down all of the non-boot CPUs in one shot to avoid races
* with the userspace trying to use the CPU hotplug at the same time
*/
@@
-298,7
+294,7
@@
int disable_nonboot_cpus(void)
/* Make sure the CPUs won't be enabled by someone else */
cpu_hotplug_disabled = 1;
} else {
/* Make sure the CPUs won't be enabled by someone else */
cpu_hotplug_disabled = 1;
} else {
- printk(KERN_ERR "Non-boot CPUs are not disabled");
+ printk(KERN_ERR "Non-boot CPUs are not disabled
\n
");
}
out:
mutex_unlock(&cpu_add_remove_lock);
}
out:
mutex_unlock(&cpu_add_remove_lock);
@@
-313,6
+309,8
@@
void enable_nonboot_cpus(void)
mutex_lock(&cpu_add_remove_lock);
cpu_hotplug_disabled = 0;
mutex_unlock(&cpu_add_remove_lock);
mutex_lock(&cpu_add_remove_lock);
cpu_hotplug_disabled = 0;
mutex_unlock(&cpu_add_remove_lock);
+ if (cpus_empty(frozen_cpus))
+ return;
printk("Enabling non-boot CPUs ...\n");
for_each_cpu_mask(cpu, frozen_cpus) {
printk("Enabling non-boot CPUs ...\n");
for_each_cpu_mask(cpu, frozen_cpus) {