diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-22 15:39:00 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-22 15:39:00 -0600 |
| commit | e5028b52e46eb1379d78d136bd0890705f331183 (patch) | |
| tree | 5279eabc18e590a7fcc9d3f96528a9defada14f8 /include/acpi | |
| parent | 0f6662a49bf1b5a163ed4e6321c382d2390c817b (diff) | |
| parent | 397038519f2c2ac68c125c0cd766e91041c52b30 (diff) | |
| download | talos-op-linux-e5028b52e46eb1379d78d136bd0890705f331183.tar.gz talos-op-linux-e5028b52e46eb1379d78d136bd0890705f331183.zip | |
Merge branch 'topic/jiang-mmconfig-v10' into next
* topic/jiang-mmconfig-v10:
ACPI: mark acpi_sfi_table_parse() as __init
x86/PCI: use pr_level() to replace printk(KERN_LEVEL)
x86/PCI: refine __pci_mmcfg_init() for better code readability
x86/PCI: get rid of redundant log messages
x86/PCI: simplify pci_mmcfg_late_insert_resources()
x86/PCI: update MMCONFIG information when hot-plugging PCI host bridges
PCI/ACPI: provide MMCONFIG address for PCI host bridges
x86/PCI: add pci_mmconfig_insert()/delete() for PCI root bridge hotplug
x86/PCI: prepare pci_mmcfg_check_reserved() to be called at runtime
x86/PCI: introduce pci_mmcfg_arch_map()/pci_mmcfg_arch_unmap()
x86/PCI: use RCU list to protect mmconfig list
x86/PCI: split out pci_mmconfig_alloc() for code reuse
x86/PCI: split out pci_mmcfg_check_reserved() for code reuse
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acnames.h | 1 | ||||
| -rw-r--r-- | include/acpi/acpi_bus.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/acpi/acnames.h b/include/acpi/acnames.h index 38f508816e4a..b177f97f53b6 100644 --- a/include/acpi/acnames.h +++ b/include/acpi/acnames.h @@ -62,6 +62,7 @@ #define METHOD_NAME__AEI "_AEI" #define METHOD_NAME__PRW "_PRW" #define METHOD_NAME__SRS "_SRS" +#define METHOD_NAME__CBA "_CBA" /* Method names - these methods must appear at the namespace root */ diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 9e6e1c6eb60a..457974073994 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -401,6 +401,7 @@ struct acpi_pci_root { u32 osc_support_set; /* _OSC state of support bits */ u32 osc_control_set; /* _OSC state of control bits */ + phys_addr_t mcfg_addr; }; /* helper */ |
