Skip to content

Commit 2a893f9

Browse files
torvaldstorvalds
committed
Merge tag 'pm+acpi-for-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI and power management fixes from Rafael Wysocki: - Removal of some ACPICA code that the kernel will never use from Lv Zheng. - APEI fix from Adrian Huang. - Removal of unnecessary ACPI memory hotplug driver code from Liu Jinsong. - Minor ACPI power management fixes. - ACPI debug code fix from Joe Perches. - ACPI fix to make system bus device nodes get the right names. - PNP resources handling fixes from Witold Szczeponik. - cpuidle fix for a recent regression stalling boot on systems with great numbers of CPUs from Daniel Lezcano. - cpuidle fixes from Sivaram Nair. - intel_idle debug message fix from Youquan Song. - cpufreq build regression fix from Larry Finger. - cpufreq fix for an obscure initialization race related to statistics from Konstantin Khlebnikov. - cpufreq change disabling the Longhaul driver by default from Rafał Bilski. - PM core fix preventing device suspend errors from happening during system suspend due to obscure race conditions. - PM QoS local variable name cleanup. * tag 'pm+acpi-for-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PM: Move disabling/enabling runtime PM to late suspend/early resume PM / QoS: Rename local variable in dev_pm_qos_add_ancestor_request() ACPI / scan: Do not use dummy HID for system bus ACPI nodes cpufreq / governor: Fix problem with cpufreq_ondemand or cpufreq_conservative cpufreq / Longhaul: Disable driver by default cpufreq / stats: fix race between stats allocation and first usage cpuidle: fix lock contention in the idle path intel_idle: pr_debug information need separated cpuidle / coupled: fix ready counter decrement cpuidle: Fix finding state with min power_usage PNP: Handle IORESOURCE_BITS in resource allocation PNP: Simplify setting of resources ACPI / power: Remove useless message from device registering routine ACPI / glue: Update DBG macro to include KERN_DEBUG ACPI / PM: Do not apply ACPI_SUCCESS() to acpi_bus_get_device() result ACPI / memhotplug: remove redundant logic of acpi memory hotadd ACPI / APEI: Fix the returned value in erst_dbg_read ACPICA: Remove useless mini-C library.
2 parents 127aa93 + f67ffa9 commit 2a893f9

File tree

22 files changed

+154
-856
lines changed

22 files changed

+154
-856
lines changed

‎Documentation/power/runtime_pm.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -642,12 +642,13 @@ out the following operations:
642642
* During system suspend it calls pm_runtime_get_noresume() and
643643
pm_runtime_barrier() for every device right before executing the
644644
subsystem-level .suspend() callback for it. In addition to that it calls
645-
pm_runtime_disable() for every device right after executing the
646-
subsystem-level .suspend() callback for it.
645+
__pm_runtime_disable() with 'false' as the second argument for every device
646+
right before executing the subsystem-level .suspend_late() callback for it.
647647

648648
* During system resume it calls pm_runtime_enable() and pm_runtime_put_sync()
649-
for every device right before and right after executing the subsystem-level
650-
.resume() callback for it, respectively.
649+
for every device right after executing the subsystem-level .resume_early()
650+
callback and right after executing the subsystem-level .resume() callback
651+
for it, respectively.
651652

652653
7. Generic subsystem callbacks
653654

‎drivers/acpi/acpi_memhotplug.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -226,16 +226,6 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
226226
struct acpi_memory_info *info;
227227
int node;
228228

229-
230-
/* Get the range from the _CRS */
231-
result = acpi_memory_get_device_resources(mem_device);
232-
if (result) {
233-
dev_err(&mem_device->device->dev,
234-
"get_device_resources failed\n");
235-
mem_device->state = MEMORY_INVALID_STATE;
236-
return result;
237-
}
238-
239229
node = acpi_get_node(mem_device->device->handle);
240230
/*
241231
* Tell the VM there is more memory here...
@@ -342,14 +332,6 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
342332
break;
343333
}
344334

345-
if (acpi_memory_check_device(mem_device))
346-
break;
347-
348-
if (acpi_memory_enable_device(mem_device)) {
349-
acpi_handle_err(handle,"Cannot enable memory device\n");
350-
break;
351-
}
352-
353335
ost_code = ACPI_OST_SC_SUCCESS;
354336
break;
355337

‎drivers/acpi/acpica/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,5 +162,5 @@ acpi-y += \
162162
utxferror.o \
163163
utxfmutex.o
164164

165-
acpi-$(ACPI_FUTURE_USAGE) += uttrack.o utcache.o utclib.o
165+
acpi-$(ACPI_FUTURE_USAGE) += uttrack.o utcache.o
166166

0 commit comments

Comments
 (0)