git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
pci_64.c
diff --git
a/arch/powerpc/kernel/pci_64.c
b/arch/powerpc/kernel/pci_64.c
index
5ad87c4
..
247937d
100644
(file)
--- 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,
return -EINVAL;
vma->vm_pgoff = offset >> PAGE_SHIFT;
- vma->vm_flags |= VM_SHM | VM_LOCKED | VM_IO;
vma->vm_page_prot = __pci_mmap_set_pgprot(dev, rp,
vma->vm_page_prot,
mmap_state, write_combine);