From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 31 Oct 2013 20:12:40 +0000 (-0600)
Subject: Merge branch 'pci/misc' into next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=33de1b8bf6e11a3bc69faf2f7ffb3692c723bdf5;p=deliverable%2Flinux.git

Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Report pci_pme_active() kmalloc failure
  mn10300/PCI: Remove useless pcibios_last_bus
  frv/PCI: Remove pcibios_last_bus
  PCI: Fail MSI/MSI-X initialization if device is not in PCI_D0
  x86/PCI: Coalesce multiple overlapping host bridge windows
  MAINTAINERS: Add arch/x86/pci to PCI file patterns
  PCI/PM: Remove pci_pm_complete()
  PCI: Add pci_dev_show_local_cpu() to simplify code
  mn10300/PCI: Remove unused pci_mem_start
  cris/PCI: Remove unused pci_mem_start
  PCI: Make pci_dev_pm_ops static

Conflicts:
	drivers/pci/pci-sysfs.c
---

33de1b8bf6e11a3bc69faf2f7ffb3692c723bdf5
diff --cc drivers/pci/pci-sysfs.c
index 82cc45867eaa,d9252dd89ea9..2aaa83c85a4e
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@@ -74,11 -73,12 +74,13 @@@ static ssize_t broken_parity_status_sto
  
  	return count;
  }
 +static DEVICE_ATTR_RW(broken_parity_status);
  
- static ssize_t local_cpus_show(struct device *dev,
- 			struct device_attribute *attr, char *buf)
- {		
+ static ssize_t pci_dev_show_local_cpu(struct device *dev,
+ 		int type,
+ 		struct device_attribute *attr,
+ 		char *buf)
+ {
  	const struct cpumask *mask;
  	int len;
  
@@@ -93,26 -96,18 +98,20 @@@
  	buf[len] = '\0';
  	return len;
  }
+ 
+ static ssize_t local_cpus_show(struct device *dev,
+ 			struct device_attribute *attr, char *buf)
+ {
+ 	return pci_dev_show_local_cpu(dev, 1, attr, buf);
+ }
 +static DEVICE_ATTR_RO(local_cpus);
  
  static ssize_t local_cpulist_show(struct device *dev,
  			struct device_attribute *attr, char *buf)
  {
- 	const struct cpumask *mask;
- 	int len;
- 
- #ifdef CONFIG_NUMA
- 	mask = (dev_to_node(dev) == -1) ? cpu_online_mask :
- 					  cpumask_of_node(dev_to_node(dev));
- #else
- 	mask = cpumask_of_pcibus(to_pci_dev(dev)->bus);
- #endif
- 	len = cpulist_scnprintf(buf, PAGE_SIZE-2, mask);
- 	buf[len++] = '\n';
- 	buf[len] = '\0';
- 	return len;
+ 	return pci_dev_show_local_cpu(dev, 0, attr, buf);
  }
 +static DEVICE_ATTR_RO(local_cpulist);
  
  /*
   * PCI Bus Class Devices