Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a893f91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 127aa930 f67ffa95

Documentation/power/runtime_pm.txt

+5 −4
Original line number Diff line number Diff line
@@ -642,12 +642,13 @@ out the following operations: 
  * During system suspend it calls pm_runtime_get_noresume() and

    pm_runtime_barrier() for every device right before executing the

    subsystem-level .suspend() callback for it.  In addition to that it calls

    pm_runtime_disable() for every device right after executing the

    subsystem-level .suspend() callback for it.

    __pm_runtime_disable() with 'false' as the second argument for every device

    right before executing the subsystem-level .suspend_late() callback for it.



  * During system resume it calls pm_runtime_enable() and pm_runtime_put_sync()

    for every device right before and right after executing the subsystem-level

    .resume() callback for it, respectively.

    for every device right after executing the subsystem-level .resume_early()

    callback and right after executing the subsystem-level .resume() callback

    for it, respectively.



7. Generic subsystem callbacks

drivers/acpi/acpi_memhotplug.c

+0 −18
Original line number Diff line number Diff line
@@ -226,16 +226,6 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device) 
	struct acpi_memory_info *info;

	int node;





	/* Get the range from the _CRS */

	result = acpi_memory_get_device_resources(mem_device);

	if (result) {

		dev_err(&mem_device->device->dev,

			"get_device_resources failed\n");

		mem_device->state = MEMORY_INVALID_STATE;

		return result;

	}



	node = acpi_get_node(mem_device->device->handle);

	/*

	 * 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) 
			break;

		}



		if (acpi_memory_check_device(mem_device))

			break;



		if (acpi_memory_enable_device(mem_device)) {

			acpi_handle_err(handle,"Cannot enable memory device\n");

			break;

		}



		ost_code = ACPI_OST_SC_SUCCESS;

		break;

drivers/acpi/acpica/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -162,5 +162,5 @@ acpi-y += \ 
	utxferror.o	\

	utxfmutex.o



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

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

drivers/acpi/acpica/utclib.c

deleted100644 → 0
+0 −749

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/acpi/apei/erst-dbg.c

+10 −1
Original line number Diff line number Diff line
@@ -111,8 +111,17 @@ static ssize_t erst_dbg_read(struct file *filp, char __user *ubuf, 
	if (rc)

		goto out;

	/* no more record */

	if (id == APEI_ERST_INVALID_RECORD_ID)

	if (id == APEI_ERST_INVALID_RECORD_ID) {

		/*

		 * If the persistent store is empty initially, the function

		 * 'erst_read' below will return "-ENOENT" value. This causes

		 * 'retry_next' label is entered again. The returned value

		 * should be zero indicating the read operation is EOF.

		 */

		len = 0;



		goto out;

	}

retry:

	rc = len = erst_read(id, erst_dbg_buf, erst_dbg_buf_len);

	/* The record may be cleared by others, try read next record */