aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r--arch/powerpc/kernel/pci_32.c1
-rw-r--r--arch/powerpc/kernel/pci_64.c1
-rw-r--r--arch/powerpc/kernel/proc_ppc64.c2
3 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index c858eb4bef17..b5431ccf1147 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -1654,7 +1654,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
1654 return -EINVAL; 1654 return -EINVAL;
1655 1655
1656 vma->vm_pgoff = offset >> PAGE_SHIFT; 1656 vma->vm_pgoff = offset >> PAGE_SHIFT;
1657 vma->vm_flags |= VM_SHM | VM_LOCKED | VM_IO;
1658 vma->vm_page_prot = __pci_mmap_set_pgprot(dev, rp, 1657 vma->vm_page_prot = __pci_mmap_set_pgprot(dev, rp,
1659 vma->vm_page_prot, 1658 vma->vm_page_prot,
1660 mmap_state, write_combine); 1659 mmap_state, write_combine);
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 5ad87c426bed..247937dd8b73 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -877,7 +877,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
877 return -EINVAL; 877 return -EINVAL;
878 878
879 vma->vm_pgoff = offset >> PAGE_SHIFT; 879 vma->vm_pgoff = offset >> PAGE_SHIFT;
880 vma->vm_flags |= VM_SHM | VM_LOCKED | VM_IO;
881 vma->vm_page_prot = __pci_mmap_set_pgprot(dev, rp, 880 vma->vm_page_prot = __pci_mmap_set_pgprot(dev, rp,
882 vma->vm_page_prot, 881 vma->vm_page_prot,
883 mmap_state, write_combine); 882 mmap_state, write_combine);
diff --git a/arch/powerpc/kernel/proc_ppc64.c b/arch/powerpc/kernel/proc_ppc64.c
index 2b87f82df135..2ab8f2be911e 100644
--- a/arch/powerpc/kernel/proc_ppc64.c
+++ b/arch/powerpc/kernel/proc_ppc64.c
@@ -115,8 +115,6 @@ static int page_map_mmap( struct file *file, struct vm_area_struct *vma )
115{ 115{
116 struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); 116 struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
117 117
118 vma->vm_flags |= VM_SHM | VM_LOCKED;
119
120 if ((vma->vm_end - vma->vm_start) > dp->size) 118 if ((vma->vm_end - vma->vm_start) > dp->size)
121 return -EINVAL; 119 return -EINVAL;
122 120