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>

1 files changed, 2 insertions, 2 deletions

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,