diff options
| author | Huang Ying <ying.huang@intel.com> | 2010-05-18 14:35:16 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-05-19 22:40:14 -0400 |
| commit | affb72c3a8984ba55e055b0a0228c3ea1a056758 (patch) | |
| tree | a6d4c9051110c03f9222bde9c3dcea7822f8570c /include | |
| parent | ea8c071cad789b1919355fc7a67182a5c9994e6b (diff) | |
| download | op-kernel-dev-affb72c3a8984ba55e055b0a0228c3ea1a056758.zip op-kernel-dev-affb72c3a8984ba55e055b0a0228c3ea1a056758.tar.gz | |
ACPI, APEI, PCIE AER, use general HEST table parsing in AER firmware_first setup
Now, a dedicated HEST tabling parsing code is used for PCIE AER
firmware_first setup. It is rebased on general HEST tabling parsing
code of APEI. The firmware_first setup code is moved from PCI core to
AER driver too, because it is only AER related.
Signed-off-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Reviewed-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_hest.h | 12 | ||||
| -rw-r--r-- | include/linux/pci.h | 3 |
2 files changed, 2 insertions, 13 deletions
diff --git a/include/acpi/acpi_hest.h b/include/acpi/acpi_hest.h deleted file mode 100644 index 63194d0..0000000 --- a/include/acpi/acpi_hest.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __ACPI_HEST_H -#define __ACPI_HEST_H - -#include <linux/pci.h> - -#ifdef CONFIG_ACPI -extern int acpi_hest_firmware_first_pci(struct pci_dev *pci); -#else -static inline int acpi_hest_firmware_first_pci(struct pci_dev *pci) { return 0; } -#endif - -#endif diff --git a/include/linux/pci.h b/include/linux/pci.h index a788fa1..63967e8 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -311,7 +311,8 @@ struct pci_dev { unsigned int is_virtfn:1; unsigned int reset_fn:1; unsigned int is_hotplug_bridge:1; - unsigned int aer_firmware_first:1; + unsigned int __aer_firmware_first_valid:1; + unsigned int __aer_firmware_first:1; pci_dev_flags_t dev_flags; atomic_t enable_cnt; /* pci_enable_device has been called */ |
