Use vm_insert_page() instead of remap_pfn_range(), and remove
the PageReserved fiddling.
Signed-off-by: Nick Holloway <[email protected]>
---
Although the cpia driver functioned correctly after printing out the
"incomplete pfn remapping" message, I thought I would have a go at the
trivial conversion'' as I have access to the hardware.
Driver has been tested with a parport CPIA camera (using "motion").
cpia.c | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
--- linux-2.6.15-rc4/drivers/media/video/cpia.c~ 2005-12-03 10:04:33.000000000 +0000
+++ linux-2.6.15-rc4/drivers/media/video/cpia.c 2005-12-05 11:20:57.000000000 +0000
@@ -219,7 +219,6 @@ static void set_flicker(struct cam_param
static void *rvmalloc(unsigned long size)
{
void *mem;
- unsigned long adr;
size = PAGE_ALIGN(size);
mem = vmalloc_32(size);
@@ -227,29 +226,15 @@ static void *rvmalloc(unsigned long size
return NULL;
memset(mem, 0, size); /* Clear the ram out, no junk to the user */
- adr = (unsigned long) mem;
- while (size > 0) {
- SetPageReserved(vmalloc_to_page((void *)adr));
- adr += PAGE_SIZE;
- size -= PAGE_SIZE;
- }
return mem;
}
static void rvfree(void *mem, unsigned long size)
{
- unsigned long adr;
-
if (!mem)
return;
- adr = (unsigned long) mem;
- while ((long) size > 0) {
- ClearPageReserved(vmalloc_to_page((void *)adr));
- adr += PAGE_SIZE;
- size -= PAGE_SIZE;
- }
vfree(mem);
}
@@ -3753,7 +3738,8 @@ static int cpia_mmap(struct file *file,
struct video_device *dev = file->private_data;
unsigned long start = vma->vm_start;
unsigned long size = vma->vm_end - vma->vm_start;
- unsigned long page, pos;
+ unsigned long pos;
+ struct page* page;
struct cam_data *cam = dev->priv;
int retval;
@@ -3781,8 +3767,8 @@ static int cpia_mmap(struct file *file,
pos = (unsigned long)(cam->frame_buf);
while (size > 0) {
- page = vmalloc_to_pfn((void *)pos);
- if (remap_pfn_range(vma, start, page, PAGE_SIZE, PAGE_SHARED)) {
+ page = vmalloc_to_page((void *)pos);
+ if (vm_insert_page(vma, start, page)) {
up(&cam->busy_lock);
return -EAGAIN;
}
--
`O O' | [email protected]
// ^ \\ | http://www.pyrites.org.uk/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
