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>

8 files changed, 18 insertions, 20 deletions

diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c
index cff73faae991..16dc43e9d940 100644
--- a/arch/um/kernel/initrd.c
+++ b/arch/um/kernel/initrd.c
@@ -63,7 +63,7 @@ int load_initrd(char *filename, void *buf, int size)
                 printk("Opening '%s' failed - err = %d\n", filename, -fd);
                 return -1;
         }
-        n = os_read_file_k(fd, buf, size);
+        n = os_read_file(fd, buf, size);
         if(n != size){
                 printk("Read of %d bytes from '%s' failed, err = %d\n", size,
                        filename, -n);
diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c
index 7c158448b9fd..7b3e53fb8070 100644
--- a/arch/um/kernel/ksyms.c
+++ b/arch/um/kernel/ksyms.c
@@ -62,9 +62,7 @@ EXPORT_SYMBOL(os_get_exec_close);
 EXPORT_SYMBOL(os_set_exec_close);
 EXPORT_SYMBOL(os_getpid);
 EXPORT_SYMBOL(os_open_file);
-EXPORT_SYMBOL(os_read_file_k);
 EXPORT_SYMBOL(os_read_file);
-EXPORT_SYMBOL(os_write_file_k);
 EXPORT_SYMBOL(os_write_file);
 EXPORT_SYMBOL(os_seek_file);
 EXPORT_SYMBOL(os_lock_file);
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
index 77021a627da6..df1ad3ba130c 100644
--- a/arch/um/kernel/physmem.c
+++ b/arch/um/kernel/physmem.c
@@ -211,7 +211,7 @@ void physmem_forget_descriptor(int fd)
                         panic("physmem_forget_descriptor - failed to seek "
                               "to %lld in fd %d, error = %d\n",
                               offset, fd, -err);
-                err = os_read_file_k(fd, addr, PAGE_SIZE);
+                err = os_read_file(fd, addr, PAGE_SIZE);
                 if(err < 0)
                         panic("physmem_forget_descriptor - failed to read "
                               "from fd %d to 0x%p, error = %d\n",
@@ -341,7 +341,7 @@ void setup_physmem(unsigned long start, unsigned long reserve_end,
          * from physmem_fd, so it needs to be written out there.
          */
         os_seek_file(physmem_fd, __pa(&__syscall_stub_start));
-        os_write_file_k(physmem_fd, &__syscall_stub_start, PAGE_SIZE);
+        os_write_file(physmem_fd, &__syscall_stub_start, PAGE_SIZE);
 
         bootmap_size = init_bootmem(pfn, pfn + delta);
         free_bootmem(__pa(reserve_end) + bootmap_size,
diff --git a/arch/um/kernel/sigio.c b/arch/um/kernel/sigio.c
index f756e78085e4..89f9866a1354 100644
--- a/arch/um/kernel/sigio.c
+++ b/arch/um/kernel/sigio.c
@@ -21,7 +21,7 @@ static irqreturn_t sigio_interrupt(int irq, void *data)
 {
         char c;
 
-        os_read_file_k(sigio_irq_fd, &c, sizeof(c));
+        os_read_file(sigio_irq_fd, &c, sizeof(c));
         reactivate_fd(sigio_irq_fd, SIGIO_WRITE_IRQ);
         return IRQ_HANDLED;
 }
diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c
index 9ac562124654..e6a7778006ad 100644
--- a/arch/um/kernel/smp.c
+++ b/arch/um/kernel/smp.c
@@ -47,7 +47,7 @@ struct task_struct *idle_threads[NR_CPUS];
 
 void smp_send_reschedule(int cpu)
 {
-        os_write_file_k(cpu_data[cpu].ipi_pipe[1], "R", 1);
+        os_write_file(cpu_data[cpu].ipi_pipe[1], "R", 1);
         num_reschedules_sent++;
 }
 
@@ -59,7 +59,7 @@ void smp_send_stop(void)
         for(i = 0; i < num_online_cpus(); i++){
                 if(i == current_thread->cpu)
                         continue;
-                os_write_file_k(cpu_data[i].ipi_pipe[1], "S", 1);
+                os_write_file(cpu_data[i].ipi_pipe[1], "S", 1);
         }
         printk("done\n");
 }
@@ -108,8 +108,8 @@ static struct task_struct *idle_thread(int cpu)
                           { .pid =      new_task->thread.mode.tt.extern_pid,
                             .task =     new_task } );
         idle_threads[cpu] = new_task;
-        CHOOSE_MODE(os_write_file_k(new_task->thread.mode.tt.switch_pipe[1], &c,
-                                    sizeof(c)),
+        CHOOSE_MODE(os_write_file(new_task->thread.mode.tt.switch_pipe[1], &c,
+                                  sizeof(c)),
                     ({ panic("skas mode doesn't support SMP"); }));
         return new_task;
 }
@@ -179,7 +179,7 @@ void IPI_handler(int cpu)
         int fd;
 
         fd = cpu_data[cpu].ipi_pipe[0];
-        while (os_read_file_k(fd, &c, 1) == 1) {
+        while (os_read_file(fd, &c, 1) == 1) {
                 switch (c) {
                 case 'C':
                         smp_call_function_slave(cpu);
@@ -239,7 +239,7 @@ int smp_call_function(void (*_func)(void *info), void *_info, int nonatomic,
         info = _info;
 
         for_each_online_cpu(i)
-                os_write_file_k(cpu_data[i].ipi_pipe[1], "C", 1);
+                os_write_file(cpu_data[i].ipi_pipe[1], "C", 1);
 
         while (atomic_read(&scf_started) != cpus)
                 barrier();
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);
 }