patch-2.1.45 linux/drivers/char/mem.c

• Lines: 32
• Date: Wed Jul 16 19:22:50 1997
• Orig file: v2.1.44/linux/drivers/char/mem.c
• Orig date: Mon Jun 16 16:35:55 1997

diff -u --recursive --new-file v2.1.44/linux/drivers/char/mem.c linux/drivers/char/mem.c
@@ -20,6 +20,7 @@
 #include <linux/mm.h>
 #include <linux/random.h>
 #include <linux/init.h>
+#include <linux/joystick.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -134,8 +135,7 @@
 #endif
 	if (remap_page_range(vma->vm_start, offset, vma->vm_end - vma->vm_start, vma->vm_page_prot))
 		return -EAGAIN;
-	vma->vm_inode = inode;
-	atomic_inc(&inode->i_count);
+	vma->vm_dentry = dget(file->f_dentry);
 	return 0;
 }
 
@@ -532,6 +532,13 @@
 #ifdef CONFIG_SOUND
 	soundcard_init();
 #endif
+#ifdef CONFIG_JOYSTICK
+	/*
+	 *	Some joysticks only appear when the soundcard they are
+	 *	connected too is confgured. Keep the sound/joystick ordering.
+	 */
+	joystick_init();
+#endif	
 #if CONFIG_QIC02_TAPE
 	qic02_tape_init();
 #endif