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 branch 'for-linus' of git://git.infradead.org/users/eparis/notify
[pandora-kernel.git]
/
arch
/
x86
/
pci
/
i386.c
diff --git
a/arch/x86/pci/i386.c
b/arch/x86/pci/i386.c
index
826140a
..
c4bb261
100644
(file)
--- a/
arch/x86/pci/i386.c
+++ b/
arch/x86/pci/i386.c
@@
-316,6
+316,8
@@
int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
*/
prot |= _PAGE_CACHE_UC_MINUS;
+ prot |= _PAGE_IOMAP; /* creating a mapping for IO */
+
vma->vm_page_prot = __pgprot(prot);
if (io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,