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, 1 insertions, 1 deletions

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);