diff options
| author | Vladimir Murzin <vladimir.murzin@arm.com> | 2017-05-24 11:30:18 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-06-05 11:29:40 +0200 |
| commit | 7ef4783e19a84fe1e8b58f4c27b858dfdcaef207 (patch) | |
| tree | 78e90d39390e97bef1289b350f572c78bdc59a1e /arch/arm/include/asm/pgtable-nommu.h | |
| parent | ARM: 8675/1: MCPM: ensure not to enter __hyp_soft_restart from loopback and c... (diff) | |
| download | linux-7ef4783e19a84fe1e8b58f4c27b858dfdcaef207.tar.xz linux-7ef4783e19a84fe1e8b58f4c27b858dfdcaef207.zip | |
ARM: 8676/1: NOMMU: provide pgprot_device() macro
NOMMU build leads to the following error:
CC drivers/pci/mmap.o
drivers/pci/mmap.c: In function 'pci_mmap_resource_range':
drivers/pci/mmap.c:60:3: error: implicit declaration of function 'pgprot_device' [-Werror=implicit-function-declaration]
vma->vm_page_prot = pgprot_device(vma->vm_page_prot);
^
cc1: some warnings being treated as errors
scripts/Makefile.build:302: recipe for target 'drivers/pci/mmap.o' failed
make[2]: *** [drivers/pci/mmap.o] Error 1
scripts/Makefile.build:561: recipe for target 'drivers/pci' failed
make[1]: *** [drivers/pci] Error 2
Makefile:1016: recipe for target 'drivers' failed
make: *** [drivers] Error 2
Fix it with support of pgprot_device() macro for NOMMU.
Fixes: 00d2904ffeac ("ARM/PCI: Use generic pci_mmap_resource_range()")
Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/pgtable-nommu.h')
| -rw-r--r-- | arch/arm/include/asm/pgtable-nommu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/pgtable-nommu.h b/arch/arm/include/asm/pgtable-nommu.h index 302240c19a5a..a0d726a47c8a 100644 --- a/arch/arm/include/asm/pgtable-nommu.h +++ b/arch/arm/include/asm/pgtable-nommu.h @@ -66,6 +66,7 @@ typedef pte_t *pte_addr_t; #define pgprot_noncached(prot) (prot) #define pgprot_writecombine(prot) (prot) #define pgprot_dmacoherent(prot) (prot) +#define pgprot_device(prot) (prot) /* |