linux-kernel - linux-next: manual merge of the pm tree with the pci tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130220125555.46e16e16836ba48f70beb3a9@canb.auug.org.au>
Date:	Wed, 20 Feb 2013 12:55:55 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Rafael J. Wysocki" <rjw@...k.pl>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Yinghai Lu <yinghai@...nel.org>,
	Bjorn Helgaas <bhelgaas@...gle.com>
Subject: linux-next: manual merge of the pm tree with the pci tree

Hi Rafael,

Today's linux-next merge of the pm tree got a conflict in
drivers/pci/pci-acpi.c between commit 181380b702ee ("PCI/ACPI: Don't
cache _PRT, and don't associate them with bus numbers") from the pci tree
and commit bc9b6407bd6d ("ACPI / PM: Rework the handling of devices
depending on power resources") from the pm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/pci/pci-acpi.c
index c685ff5,e407c61..0000000
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@@ -307,8 -325,26 +307,7 @@@ static void pci_acpi_setup(struct devic
  	struct pci_dev *pci_dev = to_pci_dev(dev);
  	acpi_handle handle = ACPI_HANDLE(dev);
  	struct acpi_device *adev;
 -	acpi_status status;
 -	acpi_handle dummy;
 -
 -	/*
 -	 * Evaluate and parse _PRT, if exists.  This code allows parsing of
 -	 * _PRT objects within the scope of non-bridge devices.  Note that
 -	 * _PRTs within the scope of a PCI bridge assume the bridge's
 -	 * subordinate bus number.
 -	 *
 -	 * TBD: Can _PRTs exist within the scope of non-bridge PCI devices?
 -	 */
 -	status = acpi_get_handle(handle, METHOD_NAME__PRT, &dummy);
 -	if (ACPI_SUCCESS(status)) {
 -		unsigned char bus;
 -
 -		bus = pci_dev->subordinate ?
 -			pci_dev->subordinate->number : pci_dev->bus->number;
 -		acpi_pci_irq_add_prt(handle, pci_domain_nr(pci_dev->bus), bus);
 -	}
  
- 	acpi_power_resource_register_device(dev, handle);
  	if (acpi_bus_get_device(handle, &adev) || !adev->wakeup.flags.valid)
  		return;
  
@@@ -330,7 -367,10 +329,6 @@@ static void pci_acpi_cleanup(struct dev
  		device_set_run_wake(dev, false);
  		pci_acpi_remove_pm_notifier(adev);
  	}
- 	acpi_power_resource_unregister_device(dev, handle);
 -
 -	if (pci_dev->subordinate)
 -		acpi_pci_irq_del_prt(pci_domain_nr(pci_dev->bus),
 -				     pci_dev->subordinate->number);
  }
  
  static struct acpi_bus_type acpi_pci_bus = {

Content of type "application/pgp-signature" skipped