git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
video
/
igafb.c
diff --git
a/drivers/video/igafb.c
b/drivers/video/igafb.c
index
2da19ea
..
67f384f
100644
(file)
--- a/
drivers/video/igafb.c
+++ b/
drivers/video/igafb.c
@@
-33,7
+33,6
@@
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/mm.h>
-#include <linux/tty.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/delay.h>
@@
-219,7
+218,7
@@
static void iga_blank_border(struct iga_par *par)
}
#ifdef __sparc__
}
#ifdef __sparc__
-static int igafb_mmap(struct fb_info *info,
struct file *file,
+static int igafb_mmap(struct fb_info *info,
struct vm_area_struct *vma)
{
struct iga_par *par = (struct iga_par *)info->par;
struct vm_area_struct *vma)
{
struct iga_par *par = (struct iga_par *)info->par;
@@
-232,9
+231,6
@@
static int igafb_mmap(struct fb_info *info, struct file *file,
size = vma->vm_end - vma->vm_start;
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;
/* Each page, see which map applies */
for (page = 0; page < size; ) {
map_size = 0;
@@
-536,8
+532,7
@@
int __init igafb_init(void)
if (!iga_init(info, par)) {
iounmap((void *)par->io_base);
iounmap(info->screen_base);
if (!iga_init(info, par)) {
iounmap((void *)par->io_base);
iounmap(info->screen_base);
- if (par->mmap_map)
- kfree(par->mmap_map);
+ kfree(par->mmap_map);
kfree(info);
}
kfree(info);
}