From a6ea4cceed18edebe1eb6001cb9e0f88cd741a6c Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Sun, 6 May 2007 14:51:43 -0700 Subject: 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 Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/um/sys-i386/bugs.c | 4 ++-- arch/um/sys-i386/ldt.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'arch/um/sys-i386') diff --git a/arch/um/sys-i386/bugs.c b/arch/um/sys-i386/bugs.c index f5dfe49c844..0393e44813e 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 d031a13bd96..a939a7ef022 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, ©, sizeof(copy)); + i = os_write_file(new_mm->id.u.mm_fd, ©, sizeof(copy)); if(i != sizeof(copy)) printk("new_mm : /proc/mm copy_segments failed, " "err = %d\n", -i); -- cgit v1.2.3