diff options
| author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2010-10-22 21:24:06 +0100 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2010-10-22 21:24:06 +0100 |
| commit | 67ba37293e938208795d6a3562201bdb0cf43393 (patch) | |
| tree | 3522e949ff19f3809583bfb3fa3973ddf264689d /arch/x86/pci/i386.c | |
| parent | cd07202cc8262e1669edff0d97715f3dd9260917 (diff) | |
| parent | 5bba6c56dc99ff88f79a79572e29ecf445710878 (diff) | |
| download | linux-67ba37293e938208795d6a3562201bdb0cf43393.tar.gz linux-67ba37293e938208795d6a3562201bdb0cf43393.tar.bz2 linux-67ba37293e938208795d6a3562201bdb0cf43393.zip | |
Merge commit 'konrad/stable/xen-pcifront-0.8.2' into 2.6.36-rc8-initial-domain-v6
Diffstat (limited to 'arch/x86/pci/i386.c')
| -rw-r--r-- | arch/x86/pci/i386.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index 55253095be84..8379c2c3d076 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c @@ -311,6 +311,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, |