From: Nick Piggin <npiggin@suse.de>
To: Andrew Morton <akpm@osdl.org>
Cc: Linux Kernel <linux-kernel@vger.kernel.org>,
Nick Piggin <npiggin@suse.de>,
Linux Memory Management <linux-mm@kvack.org>
Subject: [patch 5/5] drivers: leave vm_flags alone
Date: Fri, 21 Apr 2006 08:44:00 +0200 (CEST) [thread overview]
Message-ID: <20060301045952.12434.16351.sendpatchset@linux.site> (raw)
In-Reply-To: <20060301045901.12434.54077.sendpatchset@linux.site>
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@suse.de>
Index: linux-2.6/drivers/media/video/em28xx/em28xx-video.c
===================================================================
--- linux-2.6.orig/drivers/media/video/em28xx/em28xx-video.c
+++ linux-2.6/drivers/media/video/em28xx/em28xx-video.c
@@ -620,10 +620,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);
Index: linux-2.6/drivers/media/video/et61x251/et61x251_core.c
===================================================================
--- linux-2.6.orig/drivers/media/video/et61x251/et61x251_core.c
+++ linux-2.6/drivers/media/video/et61x251/et61x251_core.c
@@ -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;
Index: linux-2.6/drivers/media/video/meye.c
===================================================================
--- linux-2.6.orig/drivers/media/video/meye.c
+++ linux-2.6/drivers/media/video/meye.c
@@ -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);
Index: linux-2.6/drivers/media/video/pwc/pwc-if.c
===================================================================
--- linux-2.6.orig/drivers/media/video/pwc/pwc-if.c
+++ linux-2.6/drivers/media/video/pwc/pwc-if.c
@@ -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;
Index: linux-2.6/drivers/media/video/sn9c102/sn9c102_core.c
===================================================================
--- linux-2.6.orig/drivers/media/video/sn9c102/sn9c102_core.c
+++ linux-2.6/drivers/media/video/sn9c102/sn9c102_core.c
@@ -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;
Index: linux-2.6/drivers/media/video/zc0301/zc0301_core.c
===================================================================
--- linux-2.6.orig/drivers/media/video/zc0301/zc0301_core.c
+++ linux-2.6/drivers/media/video/zc0301/zc0301_core.c
@@ -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;
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2006-04-21 6:44 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-21 6:43 [patch 0/5] mm: improve remapping of vmalloc regions Nick Piggin
2006-04-21 6:43 ` [patch 1/5] mm: remap_vmalloc_range Nick Piggin
2006-04-21 7:17 ` Andrew Morton
2006-04-21 7:33 ` Nick Piggin
2006-04-21 7:59 ` Andrew Morton
2006-04-21 8:06 ` Nick Piggin
2006-04-21 7:29 ` Andrew Morton
2006-04-21 7:41 ` Nick Piggin
2006-04-21 7:43 ` Nick Piggin
2006-04-21 8:02 ` Andrew Morton
2006-04-21 6:43 ` [patch 2/5] mm: remove vmalloc_to_pfn Nick Piggin
2006-04-21 6:55 ` Nick Piggin
2006-04-21 6:43 ` [patch 3/5] mm: remove rvmalloc Nick Piggin
2006-04-21 6:43 ` [patch 4/5] mm: extra remap_vmalloc_range check Nick Piggin
2006-04-21 6:44 ` Nick Piggin [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-04-20 17:06 [patch 0/5] mm: improve remapping of vmalloc regions Nick Piggin
2006-04-20 17:07 ` [patch 5/5] drivers: leave vm_flags alone Nick Piggin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060301045952.12434.16351.sendpatchset@linux.site \
--to=npiggin@suse.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).