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

• Lines: 29
• Date: Sun Oct 13 21:11:11 1996
• Orig file: v2.1.3/linux/drivers/char/mem.c
• Orig date: Sat Sep 28 23:14:21 1996

diff -u --recursive --new-file v2.1.3/linux/drivers/char/mem.c linux/drivers/char/mem.c
@@ -70,7 +70,7 @@
 		read++;
 	}
 #endif
-	memcpy_tofs(buf, __va(p), count);
+	copy_to_user(buf, __va(p), count);
 	read += count;
 	file->f_pos += read;
 	return read;
@@ -100,7 +100,7 @@
 		written++;
 	}
 #endif
-	memcpy_fromfs(__va(p), buf, count);
+	copy_from_user(__va(p), buf, count);
 	written += count;
 	file->f_pos += written;
 	return count;
@@ -167,7 +167,9 @@
 	const char * tmp = buf;
 
 	while (count-- > 0 && i < 65536) {
-		outb(get_user(tmp),i);
+		char c;
+		get_user(c, tmp);
+		outb(c,i);
 		i++;
 		tmp++;
 	}