The patch titled
drivers: leave vm_flags alone
has been removed from the -mm tree. Its filename is
drivers-leave-vm_flags-alone.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Nick Piggin <npiggin@xxxxxxx>
Get rid of some vm_flags twiddling from driver code. The net result of this +
the last 4 patches is that all converted remap_vmalloc_range memory can
support get_user_pages - do we want that? Can't hurt, can it?
Signed-off-by: Nick Piggin <npiggin@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/media/video/em28xx/em28xx-video.c | 4 ----
drivers/media/video/et61x251/et61x251_core.c | 3 ---
drivers/media/video/meye.c | 2 --
drivers/media/video/pwc/pwc-if.c | 2 --
drivers/media/video/sn9c102/sn9c102_core.c | 3 ---
drivers/media/video/zc0301/zc0301_core.c | 3 ---
6 files changed, 17 deletions(-)
diff -puN drivers/media/video/em28xx/em28xx-video.c~drivers-leave-vm_flags-alone drivers/media/video/em28xx/em28xx-video.c
--- devel/drivers/media/video/em28xx/em28xx-video.c~drivers-leave-vm_flags-alone 2006-04-21 00:35:11.000000000 -0700
+++ devel-akpm/drivers/media/video/em28xx/em28xx-video.c 2006-04-21 00:35:11.000000000 -0700
@@ -624,10 +624,6 @@ static int em28xx_v4l2_mmap(struct file
return -EINVAL;
}
- /* VM_IO is eventually going to replace PageReserved altogether */
- vma->vm_flags |= VM_IO;
- vma->vm_flags |= VM_RESERVED; /* avoid to swap out this VMA */
-
if (remap_vmalloc_range(vma, dev->frame[i].bufmem, 0)) {
em28xx_videodbg("mmap: remap_vmalloc_range failed\n");
mutex_unlock(&dev->fileop_lock);
diff -puN drivers/media/video/et61x251/et61x251_core.c~drivers-leave-vm_flags-alone drivers/media/video/et61x251/et61x251_core.c
--- devel/drivers/media/video/et61x251/et61x251_core.c~drivers-leave-vm_flags-alone 2006-04-21 00:35:11.000000000 -0700
+++ devel-akpm/drivers/media/video/et61x251/et61x251_core.c 2006-04-21 00:35:11.000000000 -0700
@@ -1499,9 +1499,6 @@ static int et61x251_mmap(struct file* fi
return -EINVAL;
}
- vma->vm_flags |= VM_IO;
- vma->vm_flags |= VM_RESERVED;
-
if (remap_vmalloc_range(vma, cam->frame[i].bufmem, 0)) {
mutex_unlock(&cam->fileop_mutex);
return -EAGAIN;
diff -puN drivers/media/video/meye.c~drivers-leave-vm_flags-alone drivers/media/video/meye.c
--- devel/drivers/media/video/meye.c~drivers-leave-vm_flags-alone 2006-04-21 00:35:11.000000000 -0700
+++ devel-akpm/drivers/media/video/meye.c 2006-04-21 00:35:11.000000000 -0700
@@ -1689,8 +1689,6 @@ static int meye_mmap(struct file *file,
}
vma->vm_ops = &meye_vm_ops;
- vma->vm_flags &= ~VM_IO; /* not I/O memory */
- vma->vm_flags |= VM_RESERVED; /* avoid to swap out this VMA */
vma->vm_private_data = (void *) (offset / gbufsize);
meye_vm_open(vma);
diff -puN drivers/media/video/pwc/pwc-if.c~drivers-leave-vm_flags-alone drivers/media/video/pwc/pwc-if.c
--- devel/drivers/media/video/pwc/pwc-if.c~drivers-leave-vm_flags-alone 2006-04-21 00:35:11.000000000 -0700
+++ devel-akpm/drivers/media/video/pwc/pwc-if.c 2006-04-21 00:35:11.000000000 -0700
@@ -1567,8 +1567,6 @@ static int pwc_video_mmap(struct file *f
vma->vm_start, vma->vm_end - vma->vm_start);
pdev = vdev->priv;
- vma->vm_flags |= VM_IO;
-
if (remap_vmalloc_range(vma, pdev->image_data, 0))
return -EAGAIN;
diff -puN drivers/media/video/sn9c102/sn9c102_core.c~drivers-leave-vm_flags-alone drivers/media/video/sn9c102/sn9c102_core.c
--- devel/drivers/media/video/sn9c102/sn9c102_core.c~drivers-leave-vm_flags-alone 2006-04-21 00:35:11.000000000 -0700
+++ devel-akpm/drivers/media/video/sn9c102/sn9c102_core.c 2006-04-21 00:35:11.000000000 -0700
@@ -1762,9 +1762,6 @@ static int sn9c102_mmap(struct file* fil
return -EINVAL;
}
- vma->vm_flags |= VM_IO;
- vma->vm_flags |= VM_RESERVED;
-
if (remap_vmalloc_range(vma, cam->frame[i].bufmem, 0)) {
mutex_unlock(&cam->fileop_mutex);
return -EAGAIN;
diff -puN drivers/media/video/zc0301/zc0301_core.c~drivers-leave-vm_flags-alone drivers/media/video/zc0301/zc0301_core.c
--- devel/drivers/media/video/zc0301/zc0301_core.c~drivers-leave-vm_flags-alone 2006-04-21 00:35:11.000000000 -0700
+++ devel-akpm/drivers/media/video/zc0301/zc0301_core.c 2006-04-21 00:35:11.000000000 -0700
@@ -963,9 +963,6 @@ static int zc0301_mmap(struct file* filp
return -EINVAL;
}
- vma->vm_flags |= VM_IO;
- vma->vm_flags |= VM_RESERVED;
-
if (remap_vmalloc_range(vma, cam->frame[i].bufmem, 0)) {
mutex_unlock(&cam->fileop_mutex);
return -EAGAIN;
_
Patches currently in -mm which might be from npiggin@xxxxxxx are
mm-vm_bug_on.patch
drivers-leave-vm_flags-alone.patch
drivers-catch-and-return-remap_vmalloc_range-errors.patch
reiser4-releasepage-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
