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>

3 files changed, 8 insertions, 8 deletions

diff --git a/arch/um/kernel/tt/process_kern.c b/arch/um/kernel/tt/process_kern.c
index c81bd2074930..c631303cb800 100644
--- a/arch/um/kernel/tt/process_kern.c
+++ b/arch/um/kernel/tt/process_kern.c
@@ -57,14 +57,14 @@ void switch_to_tt(void *prev, void *next)
          * nor the value in "to" (since it was the task which stole us the CPU,
          * which we don't care about). */
 
-        err = os_write_file_k(to->thread.mode.tt.switch_pipe[1], &c, sizeof(c));
+        err = os_write_file(to->thread.mode.tt.switch_pipe[1], &c, sizeof(c));
         if(err != sizeof(c))
                 panic("write of switch_pipe failed, err = %d", -err);
 
         if(from->thread.mode.tt.switch_pipe[0] == -1)
                 os_kill_process(os_getpid(), 0);
 
-        err = os_read_file_k(from->thread.mode.tt.switch_pipe[0], &c,
+        err = os_read_file(from->thread.mode.tt.switch_pipe[0], &c,
                              sizeof(c));
         if(err != sizeof(c))
                 panic("read of switch_pipe failed, errno = %d", -err);
@@ -114,7 +114,7 @@ void suspend_new_thread(int fd)
         char c;
 
         os_stop_process(os_getpid());
-        err = os_read_file_k(fd, &c, sizeof(c));
+        err = os_read_file(fd, &c, sizeof(c));
         if(err != sizeof(c))
                 panic("read failed in suspend_new_thread, err = %d", -err);
 }
diff --git a/arch/um/kernel/tt/ptproxy/proxy.c b/arch/um/kernel/tt/ptproxy/proxy.c
index 007beb6b7c00..420c23f311f3 100644
--- a/arch/um/kernel/tt/ptproxy/proxy.c
+++ b/arch/um/kernel/tt/ptproxy/proxy.c
@@ -338,14 +338,14 @@ int start_debugger(char *prog, int startup, int stop, int *fd_out)
                                "err = %d\n", -fd);
                         exit(1);
                 }
-                os_write_file_k(fd, gdb_init_string,
-                                sizeof(gdb_init_string) - 1);
+                os_write_file(fd, gdb_init_string,
+                              sizeof(gdb_init_string) - 1);
                 if(startup){
                         if(stop){
-                                os_write_file_k(fd, "b start_kernel\n",
+                                os_write_file(fd, "b start_kernel\n",
                                                 strlen("b start_kernel\n"));
                         }
-                        os_write_file_k(fd, "c\n", strlen("c\n"));
+                        os_write_file(fd, "c\n", strlen("c\n"));
                 }
                 if(ptrace(PTRACE_TRACEME, 0, 0, 0) < 0){
                         printk("start_debugger :  PTRACE_TRACEME failed, "
diff --git a/arch/um/kernel/tt/tracer.c b/arch/um/kernel/tt/tracer.c
index 264da6c5a5c3..c23588393f6e 100644
--- a/arch/um/kernel/tt/tracer.c
+++ b/arch/um/kernel/tt/tracer.c
@@ -44,7 +44,7 @@ static void tracer_winch_handler(int sig)
         int n;
         char c = 1;
 
-        n = os_write_file_k(tracer_winch[1], &c, sizeof(c));
+        n = os_write_file(tracer_winch[1], &c, sizeof(c));
         if(n != sizeof(c))
                 printk("tracer_winch_handler - write failed, err = %d\n", -n);
 }