diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-08-15 14:59:01 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-08-15 14:59:01 -0500 |
| commit | 5fc054a54476f9e2b3d6cc3eeb1537aa549d0ba3 (patch) | |
| tree | 6a0592aa4088435230163ada694c68b839674d60 /Documentation/admin-guide | |
| parent | c689209be23166b340c224df8ecd5deea163da56 (diff) | |
| parent | 783e84961b1d7a75045383586b8c49e02b7704cd (diff) | |
| download | linux-5fc054a54476f9e2b3d6cc3eeb1537aa549d0ba3.tar.bz2 | |
Merge branch 'pci/resource'
- Clean up devm_of_pci_get_host_bridge_resources() resource allocation
(Jan Kiszka)
- Fixup resizable BARs after suspend/resume (Christian König)
- Make "pci=earlydump" generic (Sinan Kaya)
- Fix ROM BAR access routines to stay in bounds and check for signature
correctly (Rex Zhu)
* pci/resource:
PCI: Make pci_get_rom_size() static
PCI: Add check code for last image indicator not set
PCI: Avoid accessing memory outside the ROM BAR
PCI: Make early dump functionality generic
PCI: Cleanup PCI_REBAR_CTRL_BAR_SHIFT handling
PCI: Restore resized BAR state on resume
PCI: Clean up resource allocation in devm_of_pci_get_host_bridge_resources()
# Conflicts:
# Documentation/admin-guide/kernel-parameters.txt
Diffstat (limited to 'Documentation/admin-guide')
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index d5c27d947c2e..e372208d0d29 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3018,7 +3018,7 @@ configuration space which may match multiple devices in the system. - earlydump [X86] dump PCI config space before the kernel + earlydump dump PCI config space before the kernel changes anything off [X86] don't probe for the PCI bus bios [X86-32] force use of PCI BIOS, don't access |