commit a6ea4cceed18edebe1eb6001cb9e0f88cd741a6c
author Jeff Dike <jdike@addtoit.com> Sun May 06 14:51:43 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Mon May 07 12:13:03 2007 -0700
tree 4a747a92c9bd7a8703004603ee9e91f8bfb7e95a
parent a263672424e591067e42e1d8371e56927fe73af8

uml: rename os_{read_write}_file_k back to os_{read_write}_file

Rename os_{read_write}_file_k back to os_{read_write}_file, delete
the originals and their bogus infrastructure, and fix all the callers.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

arch/um/sys-i386/bugs.c

diff --git a/arch/um/sys-i386/bugs.c b/arch/um/sys-i386/bugs.c
index f5dfe49..0393e44 100644
--- a/arch/um/sys-i386/bugs.c
+++ b/arch/um/sys-i386/bugs.c
@@ -28,7 +28,7 @@
 	ptr = buf;
 	end = &buf[len];
 	do {
-		n = os_read_file_k(fd, ptr, sizeof(*ptr));
+		n = os_read_file(fd, ptr, sizeof(*ptr));
 		c = *ptr++;
 		if(n != sizeof(*ptr)){
 			if(n == 0)
@@ -67,7 +67,7 @@
 			return 1;
 
 		do {
-			n = os_read_file_k(fd, &c, sizeof(c));
+			n = os_read_file(fd, &c, sizeof(c));
 			if(n != sizeof(c)){
 				printk("Failed to find newline in "
 				       "/proc/cpuinfo, err = %d\n", -n);

arch/um/sys-i386/ldt.c

diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c
index d031a13..a939a7e 100644
--- a/arch/um/sys-i386/ldt.c
+++ b/arch/um/sys-i386/ldt.c
@@ -517,7 +517,7 @@
 					      .u 	=
 					      { .copy_segments =
 							from_mm->id.u.mm_fd } } );
-		i = os_write_file_k(new_mm->id.u.mm_fd, &copy, sizeof(copy));
+		i = os_write_file(new_mm->id.u.mm_fd, &copy, sizeof(copy));
 		if(i != sizeof(copy))
 			printk("new_mm : /proc/mm copy_segments failed, "
 			       "err = %d\n", -i);