diff options
| author | Suresh Siddha <suresh.b.siddha@intel.com> | 2009-04-09 14:26:52 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-10 13:55:48 +0200 |
| commit | 0c3c8a18361a636069f5a5d9d0d0f9c2124e6b94 (patch) | |
| tree | f981571c3778083924be8de03445fc4c9ee5624b /drivers/char/mem.c | |
| parent | b6ff32d9aaeeeecf98f9a852d715569183585312 (diff) | |
| download | kernel_samsung_smdk4412-0c3c8a18361a636069f5a5d9d0d0f9c2124e6b94.zip kernel_samsung_smdk4412-0c3c8a18361a636069f5a5d9d0d0f9c2124e6b94.tar.gz kernel_samsung_smdk4412-0c3c8a18361a636069f5a5d9d0d0f9c2124e6b94.tar.bz2 | |
x86, PAT: Remove duplicate memtype reserve in devmem mmap
/dev/mem mmap code was doing memtype reserve/free for a while now.
Recently we added memtype tracking in remap_pfn_range, and /dev/mem mmap
uses it indirectly. So, we don't need seperate tracking in /dev/mem code
any more. That means another ~100 lines of code removed :-).
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
LKML-Reference: <20090409212709.085210000@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/char/mem.c')
| -rw-r--r-- | drivers/char/mem.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 3586b3b..8f05c38 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -301,33 +301,7 @@ static inline int private_mapping_ok(struct vm_area_struct *vma) } #endif -void __attribute__((weak)) -map_devmem(unsigned long pfn, unsigned long len, pgprot_t prot) -{ - /* nothing. architectures can override. */ -} - -void __attribute__((weak)) -unmap_devmem(unsigned long pfn, unsigned long len, pgprot_t prot) -{ - /* nothing. architectures can override. */ -} - -static void mmap_mem_open(struct vm_area_struct *vma) -{ - map_devmem(vma->vm_pgoff, vma->vm_end - vma->vm_start, - vma->vm_page_prot); -} - -static void mmap_mem_close(struct vm_area_struct *vma) -{ - unmap_devmem(vma->vm_pgoff, vma->vm_end - vma->vm_start, - vma->vm_page_prot); -} - static struct vm_operations_struct mmap_mem_ops = { - .open = mmap_mem_open, - .close = mmap_mem_close, #ifdef CONFIG_HAVE_IOREMAP_PROT .access = generic_access_phys #endif @@ -362,7 +336,6 @@ static int mmap_mem(struct file * file, struct vm_area_struct * vma) vma->vm_pgoff, size, vma->vm_page_prot)) { - unmap_devmem(vma->vm_pgoff, size, vma->vm_page_prot); return -EAGAIN; } return 0; |