projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
arch
/
x86
/
pci
/
i386.c
diff --git
a/arch/x86/pci/i386.c
b/arch/x86/pci/i386.c
index 826140af3c3c9b6ad640743c999996a4e88f1a4e..c4bb261c106e16eaeab09092a9942418dba61133 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,