[Linuxconsole-commit]CVS: ruby/linux/drivers/char Makefile,1.34,1.35 mem.c,1.20,1.21 sysrq.c,1.18,1.19

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv1539/linux/drivers/char

Modified Files:
	Makefile mem.c sysrq.c 
Log Message:
Synced to 2.5.6

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Makefile	14 Mar 2002 20:02:06 -0000	1.34
+++ Makefile	18 Mar 2002 19:29:10 -0000	1.35
@@ -23,7 +23,7 @@
 
 export-objs     :=	vt.o keyboard.o sysrq.o \
 			misc.o pty.o random.o selection.o serial.o \
-			sonypi.o tty_io.o tty_ioctl.o generic_serial.o
+			sonypi.o tty_io.o tty_ioctl.o generic_serial.o rtc.o
 
 mod-subdirs	:=	ftape drm pcmcia
 

Index: mem.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/mem.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- mem.c	14 Mar 2002 20:02:06 -0000	1.20
+++ mem.c	18 Mar 2002 19:29:10 -0000	1.21
@@ -267,6 +267,8 @@
  	return virtr + read;
 }
 
+extern long vwrite(char *buf, char *addr, unsigned long count);
+
 /*
  * This function writes to the *virtual* memory as seen by the kernel.
  */
@@ -274,12 +276,46 @@
 			  size_t count, loff_t *ppos)
 {
 	unsigned long p = *ppos;
+	ssize_t wrote = 0;
+	ssize_t virtr = 0;
+	char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
 
-	if (p >= (unsigned long) high_memory)
-		return 0;
-	if (count > (unsigned long) high_memory - p)
-		count = (unsigned long) high_memory - p;
-	return do_write_mem(file, (void*)p, p, buf, count, ppos);
+	if (p < (unsigned long) high_memory) {
+		wrote = count;
+		if (count > (unsigned long) high_memory - p)
+			wrote = (unsigned long) high_memory - p;
+
+		wrote = do_write_mem(file, (void*)p, p, buf, wrote, ppos);
+
+		p += wrote;
+		buf += wrote;
+		count -= wrote;
+	}
+
+	if (count > 0) {
+		kbuf = (char *)__get_free_page(GFP_KERNEL);
+		if (!kbuf)
+			return -ENOMEM;
+		while (count > 0) {
+			int len = count;
+
+			if (len > PAGE_SIZE)
+				len = PAGE_SIZE;
+			if (len && copy_from_user(kbuf, buf, len)) {
+				free_page((unsigned long)kbuf);
+				return -EFAULT;
+			}
+			len = vwrite(kbuf, (char *)p, len);
+			count -= len;
+			buf += len;
+			virtr += len;
+			p += len;
+		}
+		free_page((unsigned long)kbuf);
+	}
+
+ 	*ppos = p;
+ 	return virtr + wrote;
 }
 
 #if !defined(__mc68000__)

Index: sysrq.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/sysrq.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- sysrq.c	26 Feb 2002 20:14:27 -0000	1.18
+++ sysrq.c	18 Mar 2002 19:29:10 -0000	1.19
@@ -167,7 +167,7 @@
 		}
 		file_list_unlock();
 		DQUOT_OFF(sb);
-		fsync_dev(sb->s_dev);
+		fsync_bdev(sb->s_bdev);
 		flags = MS_RDONLY;
 		if (sb->s_op && sb->s_op->remount_fs) {
 			ret = sb->s_op->remount_fs(sb, &flags, NULL);
@@ -180,7 +180,7 @@
 		} else
 			printk("nothing to do\n");
 	} else { /* Sync only */
-		fsync_dev(sb->s_dev);
+		fsync_bdev(sb->s_bdev);
 		printk("OK\n");
 	}
 	console_loglevel = orig_loglevel;