patch-2.1.43 linux/drivers/sbus/char/cgfourteen.c

• Lines: 29
• Date: Thu Jun 12 16:22:07 1997
• Orig file: v2.1.42/linux/drivers/sbus/char/cgfourteen.c
• Orig date: Wed Apr 23 19:01:21 1997

diff -u --recursive --new-file v2.1.42/linux/drivers/sbus/char/cgfourteen.c linux/drivers/sbus/char/cgfourteen.c
@@ -1,4 +1,4 @@
-/* $Id: cgfourteen.c,v 1.19 1997/04/14 17:04:57 jj Exp $
+/* $Id: cgfourteen.c,v 1.22 1997/06/04 08:27:27 davem Exp $
  * cgfourteen.c: Sun SparcStation console support.
  *
  * Copyright (C) 1995 Miguel de Icaza (miguel@nuclecu.unam.mx)
@@ -23,9 +23,10 @@
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
 
-#include "../../char/vt_kern.h"
-#include "../../char/selection.h"
-#include "../../char/console_struct.h"
+/* These must be included after asm/fbio.h */
+#include <linux/vt_kern.h>
+#include <linux/selection.h>
+#include <linux/console_struct.h>
 #include "fb.h"
 
 #define CG14_MCR_INTENABLE_SHIFT	7
@@ -272,7 +273,7 @@
 		page += map_size;
 	}
         vma->vm_inode = inode;
-        inode->i_count++;
+        atomic_inc(&inode->i_count);
         return 0;
 }