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>
--
arch/um/drivers/chan_kern.c | 4 +--
arch/um/drivers/chan_user.c | 10 +++----
arch/um/drivers/cow_sys.h | 2 -
arch/um/drivers/daemon_user.c | 4 +--
arch/um/drivers/harddog_user.c | 4 +--
arch/um/drivers/hostaudio_kern.c | 4 +--
arch/um/drivers/net_user.c | 8 +++---
arch/um/drivers/port_kern.c | 2 -
arch/um/drivers/random.c | 2 -
arch/um/drivers/ubd_kern.c | 20 +++++++--------
arch/um/include/os.h | 2 -
arch/um/kernel/initrd.c | 2 -
arch/um/kernel/ksyms.c | 2 -
arch/um/kernel/physmem.c | 4 +--
arch/um/kernel/sigio.c | 2 -
arch/um/kernel/smp.c | 12 ++++-----
arch/um/kernel/tt/process_kern.c | 6 ++--
arch/um/kernel/tt/ptproxy/proxy.c | 8 +++---
arch/um/kernel/tt/tracer.c | 2 -
arch/um/os-Linux/file.c | 50 --------------------------------------
arch/um/sys-i386/bugs.c | 4 +--
arch/um/sys-i386/ldt.c | 2 -
22 files changed, 51 insertions(+), 105 deletions(-)
Index: linux-2.6.21-mm/arch/um/drivers/chan_kern.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/drivers/chan_kern.c 2007-04-12 11:34:41.000000000 -0400
+++ linux-2.6.21-mm/arch/um/drivers/chan_kern.c 2007-04-12 11:38:51.000000000 -0400
@@ -98,7 +98,7 @@ int generic_read(int fd, char *c_out, vo
{
int n;
- n = os_read_file_k(fd, c_out, sizeof(*c_out));
+ n = os_read_file(fd, c_out, sizeof(*c_out));
if(n == -EAGAIN)
return 0;
@@ -111,7 +111,7 @@ int generic_read(int fd, char *c_out, vo
int generic_write(int fd, const char *buf, int n, void *unused)
{
- return os_write_file_k(fd, buf, n);
+ return os_write_file(fd, ...
