diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-06-25 08:46:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 13:00:55 -0400 |
commit | 68402ddc677005ed1b1359bbc1f279548cfc0928 (patch) | |
tree | 83da62a2b55e2ea7e0c46ed79c0d6498d36e1942 /arch/powerpc/kernel/pci_32.c | |
parent | 9f1a3cfcffaed2fbb3206179295c79ca8289f5c3 (diff) |
[PATCH] mm: remove VM_LOCKED before remap_pfn_range and drop VM_SHM
Remove VM_LOCKED before remap_pfn range from device drivers and get rid of
VM_SHM.
remap_pfn_range() already sets VM_IO. There is no need to set VM_SHM since
it does nothing. VM_LOCKED is of no use since the remap_pfn_range does not
place pages on the LRU. The pages are therefore never subject to swap
anyways. Remove all the vm_flags settings before calling remap_pfn_range.
After removing all the vm_flag settings no use of VM_SHM is left. Drop it.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Acked-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/powerpc/kernel/pci_32.c')
-rw-r--r-- | arch/powerpc/kernel/pci_32.c | 1 |
1 files changed, 0 insertions, 1 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); |