diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-01 12:31:23 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-01 12:31:23 -0600 |
| commit | 07a7cbd3b815ea77b44d4d5bb4260b37d03a358d (patch) | |
| tree | 7b205e495fff1e1548cac893264cfdfe18ac34dd /include/asm-generic/pgtable.h | |
| parent | cc0cb67adb97793e76bf6f1f6e05694f6311cebd (diff) | |
| parent | d1e6dc91b532d3d3dbbd0fa356b775ca320dc2c2 (diff) | |
| download | talos-op-linux-07a7cbd3b815ea77b44d4d5bb4260b37d03a358d.tar.gz talos-op-linux-07a7cbd3b815ea77b44d4d5bb4260b37d03a358d.zip | |
Merge branch 'pci/host-generic' into next
* pci/host-generic:
arm64: Add architectural support for PCI
PCI: Add pci_remap_iospace() to map bus I/O resources
of/pci: Add support for parsing PCI host bridge resources from DT
of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()
PCI: Add generic domain handling
of/pci: Fix the conversion of IO ranges into IO resources
of/pci: Move of_pci_range_to_resource() to of/address.c
ARM: Define PCI_IOBASE as the base of virtual PCI IO space
of/pci: Add pci_register_io_range() and pci_pio_to_address()
asm-generic/io.h: Fix ioport_map() for !CONFIG_GENERIC_IOMAP
Conflicts:
drivers/pci/host/pci-tegra.c
Diffstat (limited to 'include/asm-generic/pgtable.h')
| -rw-r--r-- | include/asm-generic/pgtable.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 53b2acc38213..977e545a64c3 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -249,6 +249,10 @@ static inline int pmd_same(pmd_t pmd_a, pmd_t pmd_b) #define pgprot_writecombine pgprot_noncached #endif +#ifndef pgprot_device +#define pgprot_device pgprot_noncached +#endif + /* * When walking page tables, get the address of the next boundary, * or the end address of the range if that comes earlier. Although no |
