diff options
author | Christoph Hellwig <hch@lst.de> | 2006-01-14 16:21:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 21:27:15 -0500 |
commit | 216d526c89d144928f095f2800bc6c67e968d628 (patch) | |
tree | 2363b4c9ab1e4f7acea503427fa6a21e5fa3dbe8 /drivers/video/gbefb.c | |
parent | 67a6680d64e18c7a1901f31ef747ea53b6cd986d (diff) |
[PATCH] fbdev: Sanitize ->fb_mmap prototype
No need for a file argument. If we'd really need it it's in vma->vm_file
already. gbefb and sgivwfb used to set vma->vm_file to the file argument, but
the kernel alrady did that.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/gbefb.c')
-rw-r--r-- | drivers/video/gbefb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c index d744c51807b7..38d22729b129 100644 --- a/drivers/video/gbefb.c +++ b/drivers/video/gbefb.c | |||
@@ -979,7 +979,7 @@ static int gbefb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) | |||
979 | return 0; | 979 | return 0; |
980 | } | 980 | } |
981 | 981 | ||
982 | static int gbefb_mmap(struct fb_info *info, struct file *file, | 982 | static int gbefb_mmap(struct fb_info *info, |
983 | struct vm_area_struct *vma) | 983 | struct vm_area_struct *vma) |
984 | { | 984 | { |
985 | unsigned long size = vma->vm_end - vma->vm_start; | 985 | unsigned long size = vma->vm_end - vma->vm_start; |
@@ -1000,7 +1000,6 @@ static int gbefb_mmap(struct fb_info *info, struct file *file, | |||
1000 | pgprot_fb(pgprot_val(vma->vm_page_prot)); | 1000 | pgprot_fb(pgprot_val(vma->vm_page_prot)); |
1001 | 1001 | ||
1002 | vma->vm_flags |= VM_IO | VM_RESERVED; | 1002 | vma->vm_flags |= VM_IO | VM_RESERVED; |
1003 | vma->vm_file = file; | ||
1004 | 1003 | ||
1005 | /* look for the starting tile */ | 1004 | /* look for the starting tile */ |
1006 | tile = &gbe_tiles.cpu[offset >> TILE_SHIFT]; | 1005 | tile = &gbe_tiles.cpu[offset >> TILE_SHIFT]; |