diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-07 22:55:27 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-07 22:55:27 +0200 |
| commit | 5ba1aef5e5eab1ad61a4a870a606ff7ab8a574d5 (patch) | |
| tree | 52149b28d341b07df26a196c79d9d817af6f455a /drivers/acpi/acpi_processor.c | |
| parent | c095ba7224d8edc71dcef0d655911399a8bd4a3f (diff) | |
| parent | 60f75b8e97daf4a39790a20d962cb861b9220af5 (diff) | |
Merge branch 'acpi-fixes'
* acpi-fixes:
ACPI: Try harder to resolve _ADR collisions for bridges
ACPI / processor: move try_offline_node() after acpi_unmap_lsapic()
ACPI: Drop physical_node_id_bitmap from struct acpi_device
ACPI / PM: Walk physical_node_list under physical_node_lock
ACPI / video: improve quirk check in acpi_video_bqc_quirk()
Diffstat (limited to 'drivers/acpi/acpi_processor.c')
| -rw-r--r-- | drivers/acpi/acpi_processor.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index fd6c51cc3acb..5a74a9c1e42c 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -451,7 +451,6 @@ static void acpi_processor_remove(struct acpi_device *device) /* Clean up. */ per_cpu(processor_device_array, pr->id) = NULL; per_cpu(processors, pr->id) = NULL; - try_offline_node(cpu_to_node(pr->id)); /* Remove the CPU. */ get_online_cpus(); @@ -459,6 +458,8 @@ static void acpi_processor_remove(struct acpi_device *device) acpi_unmap_lsapic(pr->id); put_online_cpus(); + try_offline_node(cpu_to_node(pr->id)); + out: free_cpumask_var(pr->throttling.shared_cpu_map); kfree(pr); |