12 files changed, 21 insertions, 23 deletions

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 695db6a588ce..3ca331728d21 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -88,13 +88,13 @@ int page_is_ram(unsigned long pfn)
 }
 EXPORT_SYMBOL(page_is_ram);
 
-pgprot_t phys_mem_access_prot(struct file *file, unsigned long addr,
+pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
                               unsigned long size, pgprot_t vma_prot)
 {
         if (ppc_md.phys_mem_access_prot)
-                return ppc_md.phys_mem_access_prot(file, addr, size, vma_prot);
+                return ppc_md.phys_mem_access_prot(file, pfn, size, vma_prot);
 
-        if (!page_is_ram(addr >> PAGE_SHIFT))
+        if (!page_is_ram(pfn))
                 vma_prot = __pgprot(pgprot_val(vma_prot)
                                     | _PAGE_GUARDED | _PAGE_NO_CACHE);
         return vma_prot;
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,
  * above routine
  */
 pgprot_t pci_phys_mem_access_prot(struct file *file,
-                                  unsigned long offset,
+                                  unsigned long pfn,
                                   unsigned long size,
                                   pgprot_t protection)
 {
         struct pci_dev *pdev = NULL;
         struct resource *found = NULL;
         unsigned long prot = pgprot_val(protection);
+        unsigned long offset = pfn << PAGE_SHIFT;
         int i;
 
-        if (page_is_ram(offset >> PAGE_SHIFT))
+        if (page_is_ram(pfn))
                 return prot;
 
         prot |= _PAGE_NO_CACHE | _PAGE_GUARDED;
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c
index db94efd25369..99b48abd3296 100644
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
@@ -637,18 +637,16 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
  */
 int page_is_ram(unsigned long pfn)
 {
-        unsigned long paddr = (pfn << PAGE_SHIFT);
-
-        return paddr < __pa(high_memory);
+        return pfn < max_pfn;
 }
 
-pgprot_t phys_mem_access_prot(struct file *file, unsigned long addr,
+pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
                               unsigned long size, pgprot_t vma_prot)
 {
         if (ppc_md.phys_mem_access_prot)
-                return ppc_md.phys_mem_access_prot(file, addr, size, vma_prot);
+                return ppc_md.phys_mem_access_prot(file, pfn, size, vma_prot);
 
-        if (!page_is_ram(addr >> PAGE_SHIFT))
+        if (!page_is_ram(pfn))
                 vma_prot = __pgprot(pgprot_val(vma_prot)
                                     | _PAGE_GUARDED | _PAGE_NO_CACHE);
         return vma_prot;
diff --git a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c
index b2fb6746f00b..3d2106b022a1 100644
--- a/arch/ppc64/kernel/pci.c
+++ b/arch/ppc64/kernel/pci.c
@@ -726,16 +726,17 @@ static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,
  * above routine
  */
 pgprot_t pci_phys_mem_access_prot(struct file *file,
-                                  unsigned long offset,
+                                  unsigned long pfn,
                                   unsigned long size,
                                   pgprot_t protection)
 {
         struct pci_dev *pdev = NULL;
         struct resource *found = NULL;
         unsigned long prot = pgprot_val(protection);
+        unsigned long offset = pfn << PAGE_SHIFT;
         int i;
 
-        if (page_is_ram(offset >> PAGE_SHIFT))
+        if (page_is_ram(pfn))
                 return __pgprot(prot);
 
         prot |= _PAGE_NO_CACHE | _PAGE_GUARDED;
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index f182752fe918..9df928d4f68d 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -231,9 +231,7 @@ static ssize_t write_mem(struct file * file, const char __user * buf,
 static int mmap_mem(struct file * file, struct vm_area_struct * vma)
 {
 #if defined(__HAVE_PHYS_MEM_ACCESS_PROT)
-        unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
-
-        vma->vm_page_prot = phys_mem_access_prot(file, offset,
+        vma->vm_page_prot = phys_mem_access_prot(file, vma->vm_pgoff,
                                                  vma->vm_end - vma->vm_start,
                                                  vma->vm_page_prot);
 #elif defined(pgprot_noncached)
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 70be7009f8af..ca02aa2bfcec 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -918,7 +918,7 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
         }
 #endif
 #elif defined(__powerpc__)
-        vma->vm_page_prot = phys_mem_access_prot(file, off,
+        vma->vm_page_prot = phys_mem_access_prot(file, off >> PAGE_SHIFT,
                                                  vma->vm_end - vma->vm_start,
                                                  vma->vm_page_prot);
 #elif defined(__alpha__)
diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index 706508b1b04b..451b345cfc78 100644
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -144,7 +144,7 @@ struct machdep_calls {
         
         /* Get access protection for /dev/mem */
         pgprot_t        (*phys_mem_access_prot)(struct file *file,
-                                                unsigned long offset,
+                                                unsigned long pfn,
                                                 unsigned long size,
                                                 pgprot_t vma_prot);
 
diff --git a/include/asm-ppc/machdep.h b/include/asm-ppc/machdep.h
index 6c6d23abbe91..f01255bd1dc3 100644
--- a/include/asm-ppc/machdep.h
+++ b/include/asm-ppc/machdep.h
@@ -98,7 +98,7 @@ struct machdep_calls {
 
         /* Get access protection for /dev/mem */
         pgprot_t        (*phys_mem_access_prot)(struct file *file,
-                                                unsigned long offset,
+                                                unsigned long pfn,
                                                 unsigned long size,
                                                 pgprot_t vma_prot);
 
diff --git a/include/asm-ppc/pci.h b/include/asm-ppc/pci.h
index 643740dd727b..61434edbad7b 100644
--- a/include/asm-ppc/pci.h
+++ b/include/asm-ppc/pci.h
@@ -126,7 +126,7 @@ extern void pcibios_add_platform_entries(struct pci_dev *dev);
 
 struct file;
 extern pgprot_t pci_phys_mem_access_prot(struct file *file,
-                                         unsigned long offset,
+                                         unsigned long pfn,
                                          unsigned long size,
                                          pgprot_t prot);
 
diff --git a/include/asm-ppc/pgtable.h b/include/asm-ppc/pgtable.h
index eee601bb9ada..b28a713ba862 100644
--- a/include/asm-ppc/pgtable.h
+++ b/include/asm-ppc/pgtable.h
@@ -705,7 +705,7 @@ static inline void __ptep_set_access_flags(pte_t *ptep, pte_t entry, int dirty)
 #define pgprot_noncached(prot)  (__pgprot(pgprot_val(prot) | _PAGE_NO_CACHE | _PAGE_GUARDED))
 
 struct file;
-extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long addr,
+extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
                                      unsigned long size, pgprot_t vma_prot);
 #define __HAVE_PHYS_MEM_ACCESS_PROT
 
diff --git a/include/asm-ppc64/pci.h b/include/asm-ppc64/pci.h
index a88bbfc26967..342e2d755550 100644
--- a/include/asm-ppc64/pci.h
+++ b/include/asm-ppc64/pci.h
@@ -168,7 +168,7 @@ extern void pcibios_add_platform_entries(struct pci_dev *dev);
 
 struct file;
 extern pgprot_t pci_phys_mem_access_prot(struct file *file,
-                                         unsigned long offset,
+                                         unsigned long pfn,
                                          unsigned long size,
                                          pgprot_t prot);
 
diff --git a/include/asm-ppc64/pgtable.h b/include/asm-ppc64/pgtable.h
index c83679c9d2b0..8cf5991540e3 100644
--- a/include/asm-ppc64/pgtable.h
+++ b/include/asm-ppc64/pgtable.h
@@ -471,7 +471,7 @@ static inline void __ptep_set_access_flags(pte_t *ptep, pte_t entry, int dirty)
 #define pgprot_noncached(prot)  (__pgprot(pgprot_val(prot) | _PAGE_NO_CACHE | _PAGE_GUARDED))
 
 struct file;
-extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long addr,
+extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
                                      unsigned long size, pgprot_t vma_prot);
 #define __HAVE_PHYS_MEM_ACCESS_PROT