diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-13 18:46:15 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-13 18:46:15 -0500 |
| commit | 6b9bd1e3ee8f23b55d407becf4f6f422ec4610f2 (patch) | |
| tree | c5bee117d8ae1b20e6f9de393c382430ecc7faf5 /drivers | |
| parent | 96702be560374ee7e7139a34cab03554129abbb4 (diff) | |
| parent | 339c0fc58618b717565f109d68da50c5bc1a0510 (diff) | |
Merge branch 'pci/aer' into next
* pci/aer:
PCI/AER: Support ACPI HEST AER error sources for PCI domains other than 0
ACPICA: Add helper macros to extract bus/segment numbers from HEST table.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/pcie/aer/aerdrv_acpi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c index 4d6991794fa2..01906576ab91 100644 --- a/drivers/pci/pcie/aer/aerdrv_acpi.c +++ b/drivers/pci/pcie/aer/aerdrv_acpi.c | |||
| @@ -23,10 +23,10 @@ | |||
| 23 | static inline int hest_match_pci(struct acpi_hest_aer_common *p, | 23 | static inline int hest_match_pci(struct acpi_hest_aer_common *p, |
| 24 | struct pci_dev *pci) | 24 | struct pci_dev *pci) |
| 25 | { | 25 | { |
| 26 | return (0 == pci_domain_nr(pci->bus) && | 26 | return ACPI_HEST_SEGMENT(p->bus) == pci_domain_nr(pci->bus) && |
| 27 | p->bus == pci->bus->number && | 27 | ACPI_HEST_BUS(p->bus) == pci->bus->number && |
| 28 | p->device == PCI_SLOT(pci->devfn) && | 28 | p->device == PCI_SLOT(pci->devfn) && |
| 29 | p->function == PCI_FUNC(pci->devfn)); | 29 | p->function == PCI_FUNC(pci->devfn); |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | static inline bool hest_match_type(struct acpi_hest_header *hest_hdr, | 32 | static inline bool hest_match_type(struct acpi_hest_header *hest_hdr, |