diff options
| author | Len Brown <len.brown@intel.com> | 2010-06-12 01:16:51 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-06-12 01:16:51 -0400 |
| commit | c1db9d9bb23814a76cfb2416fd84f32c3fd6d82f (patch) | |
| tree | a46624c1b2661705a880d8672568f4586b252e7b /drivers/acpi | |
| parent | 42de5532f4a58a52a60bdd8bd4f80f9f210dd65b (diff) | |
| parent | 934231de706d2579fae14f5857fcd8de991009ff (diff) | |
Merge branch 'misc-2.6.35' into release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/fan.c | 3 | ||||
| -rw-r--r-- | drivers/acpi/processor_driver.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index acf2ab24984..8a3b840c0bb 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c @@ -347,7 +347,6 @@ static int __init acpi_fan_init(void) { int result = 0; - #ifdef CONFIG_ACPI_PROCFS acpi_fan_dir = proc_mkdir(ACPI_FAN_CLASS, acpi_root_dir); if (!acpi_fan_dir) @@ -356,7 +355,9 @@ static int __init acpi_fan_init(void) result = acpi_bus_register_driver(&acpi_fan_driver); if (result < 0) { +#ifdef CONFIG_ACPI_PROCFS remove_proc_entry(ACPI_FAN_CLASS, acpi_root_dir); +#endif return -ENODEV; } diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index b1034a9ada4..38ea0cc6dc4 100644 --- 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; } +#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)); /* |