From 926649c06f09752a81d07b958ec8dc7f861f7c14 Mon Sep 17 00:00:00 2001 From: Rik van Riel Date: Wed, 23 Jul 2008 21:27:07 -0700 Subject: [PATCH] --- yaml --- r: 105273 b: refs/heads/master c: 7ae8ed5053a39082d224a3f48409e016baca9c16 h: refs/heads/master i: 105271: 387275c1739da29ae74b1841b66d00ae25c859fb v: v3 --- [refs] | 2 +- trunk/arch/x86/pci/i386.c | 1 + trunk/drivers/char/mem.c | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6ece8d715f24..2b2489ca0bc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28b2ee20c7cba812b6f2ccf6d722cf86d00a84dc +refs/heads/master: 7ae8ed5053a39082d224a3f48409e016baca9c16 diff --git a/trunk/arch/x86/pci/i386.c b/trunk/arch/x86/pci/i386.c index 2aafb67dc5f1..a09505806b82 100644 --- a/trunk/arch/x86/pci/i386.c +++ b/trunk/arch/x86/pci/i386.c @@ -280,6 +280,7 @@ static void pci_track_mmap_page_range(struct vm_area_struct *vma) static struct vm_operations_struct pci_mmap_ops = { .open = pci_track_mmap_page_range, .close = pci_unmap_page_range, + .access = generic_access_phys, }; int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, diff --git a/trunk/drivers/char/mem.c b/trunk/drivers/char/mem.c index c2dba82eb5f7..672b08e694d0 100644 --- a/trunk/drivers/char/mem.c +++ b/trunk/drivers/char/mem.c @@ -327,7 +327,10 @@ static void mmap_mem_close(struct vm_area_struct *vma) static struct vm_operations_struct mmap_mem_ops = { .open = mmap_mem_open, - .close = mmap_mem_close + .close = mmap_mem_close, +#ifdef CONFIG_HAVE_IOREMAP_PROT + .access = generic_access_phys +#endif }; static int mmap_mem(struct file * file, struct vm_area_struct * vma)