patch-2.1.45 linux/drivers/sbus/char/cgsix.c
Next file: linux/drivers/sbus/char/cgthree.c
Previous file: linux/drivers/sbus/char/cgfourteen.c
Back to the patch index
Back to the overall index
- Lines: 33
- Date:
Wed Jul 16 20:37:21 1997
- Orig file:
v2.1.44/linux/drivers/sbus/char/cgsix.c
- Orig date:
Mon Jul 7 08:18:55 1997
diff -u --recursive --new-file v2.1.44/linux/drivers/sbus/char/cgsix.c linux/drivers/sbus/char/cgsix.c
@@ -1,4 +1,4 @@
-/* $Id: cgsix.c,v 1.33 1997/07/01 09:12:05 jj Exp $
+/* $Id: cgsix.c,v 1.35 1997/07/17 02:21:45 davem Exp $
* cgsix.c: cgsix frame buffer driver
*
* Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx)
@@ -321,11 +321,12 @@
map_offset,
map_size, vma->vm_page_prot,
fb->space);
- if (r) return -EAGAIN;
+ if (r)
+ return -EAGAIN;
page += map_size;
}
- vma->vm_inode = inode;
- atomic_inc(&inode->i_count);
+
+ vma->vm_dentry = dget(file->f_dentry);
return 0;
}
@@ -512,6 +513,10 @@
cg6info->bt->control = 0x73 << 24;
cg6info->bt->addr = 0x07 << 24;
cg6info->bt->control = 0x00 << 24;
+
+#ifdef __sparc_v9__
+ printk("VA %016lx ", fb->base);
+#endif
printk("TEC Rev %x ",
(cg6info->thc->thc_misc >> CG6_THC_MISC_REV_SHIFT) &
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov