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>

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/um/sys-i386/bugs.c b/arch/um/sys-i386/bugs.c
index f5dfe49c8442..0393e44813e7 100644
--- a/arch/um/sys-i386/bugs.c
+++ b/arch/um/sys-i386/bugs.c
@@ -28,7 +28,7 @@ static char token(int fd, char *buf, int len, char stop)
         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 @@ static int find_cpuinfo_line(int fd, char *key, char *scratch, int len)
                         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);
diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c
index d031a13bd969..a939a7ef0227 100644
--- a/arch/um/sys-i386/ldt.c
+++ b/arch/um/sys-i386/ldt.c
@@ -517,7 +517,7 @@ long init_new_ldt(struct mmu_context_skas * new_mm,
                                               .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);