4 files changed, 1 insertions, 6 deletions

diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c
index 1b05fa688996..d65b3109318a 100644
--- a/drivers/char/mmtimer.c
+++ b/drivers/char/mmtimer.c
@@ -329,7 +329,6 @@ static int mmtimer_mmap(struct file *file, struct vm_area_struct *vma)
         if (PAGE_SIZE > (1 << 16))
                 return -ENOSYS;
 
-        vma->vm_flags |= (VM_IO | VM_SHM | VM_LOCKED );
         vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
         mmtimer_addr = __pa(RTC_COUNTER_ADDR);
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index 5ae684c011f8..31b8a5f6116f 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -71,7 +71,6 @@ flash_mmap(struct file *file, struct vm_area_struct *vma)
         if (vma->vm_end - (vma->vm_start + (vma->vm_pgoff << PAGE_SHIFT)) > size)
                 size = vma->vm_end - (vma->vm_start + (vma->vm_pgoff << PAGE_SHIFT));
 
-        vma->vm_flags |= (VM_SHM | VM_LOCKED);
         vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
         if (io_remap_pfn_range(vma, vma->vm_start, addr, size, vma->vm_page_prot))
diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c
index dfdd6be551f3..ddcd330b9e89 100644
--- a/drivers/sbus/char/vfc_dev.c
+++ b/drivers/sbus/char/vfc_dev.c
@@ -623,7 +623,7 @@ static int vfc_mmap(struct file *file, struct vm_area_struct *vma)
                 map_size = sizeof(struct vfc_regs);
 
         vma->vm_flags |=
-                (VM_SHM | VM_LOCKED | VM_IO | VM_MAYREAD | VM_MAYWRITE | VM_MAYSHARE);
+                (VM_MAYREAD | VM_MAYWRITE | VM_MAYSHARE);
         map_offset = (unsigned int) (long)dev->phys_regs;
         ret = io_remap_pfn_range(vma, vma->vm_start,
                                   MK_IOSPACE_PFN(dev->which_io,
diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c
index 6b88050d21bf..8a0c2d3d3805 100644
--- a/drivers/video/igafb.c
+++ b/drivers/video/igafb.c
@@ -232,9 +232,6 @@ static int igafb_mmap(struct fb_info *info,
 
         size = vma->vm_end - vma->vm_start;
 
-        /* To stop the swapper from even considering these pages. */
-        vma->vm_flags |= (VM_SHM | VM_LOCKED);
-
         /* Each page, see which map applies */
         for (page = 0; page < size; ) {
                 map_size = 0;