summaryrefslogtreecommitdiff
path: root/Documentation/PCI
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2022-08-04 19:41:52 +0300
committerBjorn Helgaas <bhelgaas@google.com>2022-08-04 19:41:52 +0300
commitbac0f4474c63ccd466f9b657d5a0fa102847f735 (patch)
tree5fd3c4c01a779eca409ebde4443b0c64c53e7863 /Documentation/PCI
parent3dc4d3333ac6ed9cd3632e8ebb6a8dedeef7ae23 (diff)
parentc1ef322491cb880fea4e52535b15448f2a573ded (diff)
downloadlinux-bac0f4474c63ccd466f9b657d5a0fa102847f735.tar.xz
Merge branch 'pci/resource'
- Replace sparc pci_mmap_page_range() wrapper. This still leaves a sparc-specific pci_mmap_resource_range(), but it's only one interface instead of two (Arnd Bergmann) - Remove sparc-specific pci_mmap_resource_range() by implementing pci_iobar_pfn(). This removes the ability to map the entire PCI I/O space using /proc/bus/pci, but we believe that's already been broken since v2.6.28 (Arnd Bergmann) * pci/resource: sparc: Use generic pci_mmap_resource_range() PCI: Remove pci_mmap_page_range() wrapper
Diffstat (limited to 'Documentation/PCI')
-rw-r--r--Documentation/PCI/sysfs-pci.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/PCI/sysfs-pci.rst b/Documentation/PCI/sysfs-pci.rst
index 742fbd21dc1f..f495185aa88a 100644
--- a/Documentation/PCI/sysfs-pci.rst
+++ b/Documentation/PCI/sysfs-pci.rst
@@ -125,7 +125,7 @@ implementation of that functionality. To support the historical interface of
mmap() through files in /proc/bus/pci, platforms may also set HAVE_PCI_MMAP.
Alternatively, platforms which set HAVE_PCI_MMAP may provide their own
-implementation of pci_mmap_page_range() instead of defining
+implementation of pci_mmap_resource_range() instead of defining
ARCH_GENERIC_PCI_MMAP_RESOURCE.
Platforms which support write-combining maps of PCI resources must define