aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/kernel/pci.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ppc/kernel/pci.c')
-rw-r--r--arch/ppc/kernel/pci.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index ad4ef2aaa6ab..e8f4e576750a 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -1594,16 +1594,17 @@ static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,
1594 * above routine 1594 * above routine
1595 */ 1595 */
1596pgprot_t pci_phys_mem_access_prot(struct file *file, 1596pgprot_t pci_phys_mem_access_prot(struct file *file,
1597 unsigned long offset, 1597 unsigned long pfn,
1598 unsigned long size, 1598 unsigned long size,
1599 pgprot_t protection) 1599 pgprot_t protection)
1600{ 1600{
1601 struct pci_dev *pdev = NULL; 1601 struct pci_dev *pdev = NULL;
1602 struct resource *found = NULL; 1602 struct resource *found = NULL;
1603 unsigned long prot = pgprot_val(protection); 1603 unsigned long prot = pgprot_val(protection);
1604 unsigned long offset = pfn << PAGE_SHIFT;
1604 int i; 1605 int i;
1605 1606
1606 if (page_is_ram(offset >> PAGE_SHIFT)) 1607 if (page_is_ram(pfn))
1607 return prot; 1608 return prot;
1608 1609
1609 prot |= _PAGE_NO_CACHE | _PAGE_GUARDED; 1610 prot |= _PAGE_NO_CACHE | _PAGE_GUARDED;