diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2021-02-24 14:59:17 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-02-24 14:59:17 -0600 |
| commit | ce3e292eb703eb2bbe2708f9a59c3947aa99742e (patch) | |
| tree | fa6cecd652b9c96a5faf696d596c1a4cb3acc164 /include | |
| parent | 7c53f6b671f4aba70ff15e1b05148b10d58c2837 (diff) | |
| parent | f6bda644fa3a7070621c3bf12cd657f69a42f170 (diff) | |
Merge branch 'pci/enumeration'
- Unexport acpi_pci_osc_control_set() (Bjorn Helgaas)
- Remove unnecessary osc_lock mutex (Bjorn Helgaas)
- Clarify _OSC failure message (Bjorn Helgaas)
- Fix pci-bridge-emul array overruns and improve safety (Russell King)
- Fix pci_register_io_range() memory leak (Geert Uytterhoeven)
* pci/enumeration:
PCI: Fix pci_register_io_range() memory leak
PCI: pci-bridge-emul: Fix array overruns, improve safety
PCI/ACPI: Clarify message about _OSC failure
PCI/ACPI: Remove unnecessary osc_lock
PCI/ACPI: Make acpi_pci_osc_control_set() static
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 053bf05fb1f7..4703daafcce9 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -581,9 +581,6 @@ extern bool osc_pc_lpi_support_confirmed; #define ACPI_GSB_ACCESS_ATTRIB_RAW_BYTES 0x0000000E #define ACPI_GSB_ACCESS_ATTRIB_RAW_PROCESS 0x0000000F -extern acpi_status acpi_pci_osc_control_set(acpi_handle handle, - u32 *mask, u32 req); - /* Enable _OST when all relevant hotplug operations are enabled */ #if defined(CONFIG_ACPI_HOTPLUG_CPU) && \ defined(CONFIG_ACPI_HOTPLUG_MEMORY) && \ |