History

Merge branches 'pci/aer' and 'pci/virtualization' into next

* pci/aer: PCI/AER: Rename PCI_ERR_UNC_TRAIN to PCI_ERR_UNC_UND PCI/AER: Add additional PCIe AER error strings trace, RAS: Add additional PCIe AER error strings trace, RAS: Replace bare numbers with #defines for PCIe AER error strings * pci/virtualization: PCI: Add ACS quirk for Intel 10G NICs

Bjorn Helgaas committed 12 years ago

Commit cc0cb673 parents 1104528 846fc70 100ebb25 files · +68 −29Browse files

Showing the changes to include/uapi/linux (1 of 5 files). Show all

Unified · Split

include/uapi/linux/pci_regs.h+1−1
@@ -631,7 +631,7 @@ · 630 unmodified lines
631 631
632/* Advanced Error Reporting */632/* Advanced Error Reporting */
633#define PCI_ERR_UNCOR_STATUS 4 /* Uncorrectable Error Status */633#define PCI_ERR_UNCOR_STATUS 4 /* Uncorrectable Error Status */
634#define PCI_ERR_UNC_TRAIN 0x00000001 /* Training */634#define PCI_ERR_UNC_UND 0x00000001 /* Undefined */
635#define PCI_ERR_UNC_DLP 0x00000010 /* Data Link Protocol */635#define PCI_ERR_UNC_DLP 0x00000010 /* Data Link Protocol */
636#define PCI_ERR_UNC_SURPDN 0x00000020 /* Surprise Down */636#define PCI_ERR_UNC_SURPDN 0x00000020 /* Surprise Down */
637#define PCI_ERR_UNC_POISON_TLP 0x00001000 /* Poisoned TLP */637#define PCI_ERR_UNC_POISON_TLP 0x00001000 /* Poisoned TLP */