projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull thermal into release branch
[linux-drm-fsl-dcu.git]
/
arch
/
powerpc
/
kernel
/
pci_32.c
diff --git
a/arch/powerpc/kernel/pci_32.c
b/arch/powerpc/kernel/pci_32.c
index f022862de34458b90a402a6c20330819aec7ff09..e66064b5093a2496ad2e03e9ebd1212ba98ad72b 100644
(file)
--- a/
arch/powerpc/kernel/pci_32.c
+++ b/
arch/powerpc/kernel/pci_32.c
@@
-1658,7
+1658,7
@@
pgprot_t pci_phys_mem_access_prot(struct file *file,
int i;
if (page_is_ram(pfn))
- return
prot
;
+ return
__pgprot(prot)
;
prot |= _PAGE_NO_CACHE | _PAGE_GUARDED;