projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ACPI: Do not try to set up acpi processor stuff on cores exceeding maxcpus=
[cascardo/linux.git]
/
drivers
/
acpi
/
processor_driver.c
diff --git
a/drivers/acpi/processor_driver.c
b/drivers/acpi/processor_driver.c
index
5675d97
..
38ea0cc
100644
(file)
--- a/
drivers/acpi/processor_driver.c
+++ b/
drivers/acpi/processor_driver.c
@@
-581,6
+581,11
@@
static int __cpuinit acpi_processor_add(struct acpi_device *device)
return 0;
}
return 0;
}
+#ifdef CONFIG_SMP
+ if (pr->id >= setup_max_cpus && pr->id != 0)
+ return 0;
+#endif
+
BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
/*
BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
/*
@@
-616,7
+621,8
@@
static int __cpuinit acpi_processor_add(struct acpi_device *device)
acpi_processor_get_limit_info(pr);
acpi_processor_get_limit_info(pr);
- acpi_processor_power_init(pr, device);
+ if (cpuidle_get_driver() == &acpi_idle_driver)
+ acpi_processor_power_init(pr, device);
pr->cdev = thermal_cooling_device_register("Processor", device,
&processor_cooling_ops);
pr->cdev = thermal_cooling_device_register("Processor", device,
&processor_cooling_ops);
@@
-920,9
+926,14
@@
static int __init acpi_processor_init(void)
if (!acpi_processor_dir)
return -ENOMEM;
#endif
if (!acpi_processor_dir)
return -ENOMEM;
#endif
- result = cpuidle_register_driver(&acpi_idle_driver);
- if (result < 0)
- goto out_proc;
+
+ if (!cpuidle_register_driver(&acpi_idle_driver)) {
+ printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",
+ acpi_idle_driver.name);
+ } else {
+ printk(KERN_DEBUG "ACPI: acpi_idle yielding to %s",
+ cpuidle_get_driver()->name);
+ }
result = acpi_bus_register_driver(&acpi_processor_driver);
if (result < 0)
result = acpi_bus_register_driver(&acpi_processor_driver);
if (result < 0)
@@
-941,7
+952,6
@@
static int __init acpi_processor_init(void)
out_cpuidle:
cpuidle_unregister_driver(&acpi_idle_driver);
out_cpuidle:
cpuidle_unregister_driver(&acpi_idle_driver);
-out_proc:
#ifdef CONFIG_ACPI_PROCFS
remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
#endif
#ifdef CONFIG_ACPI_PROCFS
remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
#endif