diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 10:18:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 10:18:02 -0700 |
| commit | 07820c3bf17822361b25f1015125fd407d9925ed (patch) | |
| tree | 5fdd7596e5006f0e75ab59b01b846fc017ea666f /arch/microblaze/include/asm/pci.h | |
| parent | c17b0aadb7d8f87de56a4a374a8131519c0f7422 (diff) | |
| parent | 70f6283a372bef685fd64564646a3b49a55be1ea (diff) | |
| download | lwn-07820c3bf17822361b25f1015125fd407d9925ed.tar.gz lwn-07820c3bf17822361b25f1015125fd407d9925ed.zip | |
Merge tag 'microblaze-4.17-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze updates from Michal Simek:
"Use generic pci_mmap_resource_range()"
* tag 'microblaze-4.17-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Use generic pci_mmap_resource_range()
microblaze: Provide pgprot_device/writecombine macros for nommu
Diffstat (limited to 'arch/microblaze/include/asm/pci.h')
| -rw-r--r-- | arch/microblaze/include/asm/pci.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index 114b93488193..5de871eb4a59 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -47,9 +47,10 @@ extern int pci_proc_domain(struct pci_bus *bus); struct vm_area_struct; -/* Tell drivers/pci/proc.c that we have pci_mmap_page_range() */ -#define HAVE_PCI_MMAP 1 -#define arch_can_pci_mmap_io() 1 +/* Tell PCI code what kind of PCI resource mappings we support */ +#define HAVE_PCI_MMAP 1 +#define ARCH_GENERIC_PCI_MMAP_RESOURCE 1 +#define arch_can_pci_mmap_io() 1 extern int pci_legacy_read(struct pci_bus *bus, loff_t port, u32 *val, size_t count); |