diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-05-07 01:51:43 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 23:13:03 +0400 |
| commit | a6ea4cceed18edebe1eb6001cb9e0f88cd741a6c (patch) | |
| tree | 4a747a92c9bd7a8703004603ee9e91f8bfb7e95a /arch/um/drivers/chan_user.c | |
| parent | a263672424e591067e42e1d8371e56927fe73af8 (diff) | |
| download | linux-a6ea4cceed18edebe1eb6001cb9e0f88cd741a6c.tar.xz | |
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>
Diffstat (limited to 'arch/um/drivers/chan_user.c')
| -rw-r--r-- | arch/um/drivers/chan_user.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c index a15be1720e03..13f0bf852b2a 100644 --- a/arch/um/drivers/chan_user.c +++ b/arch/um/drivers/chan_user.c @@ -85,7 +85,7 @@ static int winch_thread(void *arg) pty_fd = data->pty_fd; pipe_fd = data->pipe_fd; - count = os_write_file_k(pipe_fd, &c, sizeof(c)); + count = os_write_file(pipe_fd, &c, sizeof(c)); if(count != sizeof(c)) printk("winch_thread : failed to write synchronization " "byte, err = %d\n", -count); @@ -120,7 +120,7 @@ static int winch_thread(void *arg) * host - since they are not different kernel threads, we cannot use * kernel semaphores. We don't use SysV semaphores because they are * persistent. */ - count = os_read_file_k(pipe_fd, &c, sizeof(c)); + count = os_read_file(pipe_fd, &c, sizeof(c)); if(count != sizeof(c)) printk("winch_thread : failed to read synchronization byte, " "err = %d\n", -count); @@ -130,7 +130,7 @@ static int winch_thread(void *arg) * are blocked.*/ sigsuspend(&sigs); - count = os_write_file_k(pipe_fd, &c, sizeof(c)); + count = os_write_file(pipe_fd, &c, sizeof(c)); if(count != sizeof(c)) printk("winch_thread : write failed, err = %d\n", -count); @@ -162,7 +162,7 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out) } *fd_out = fds[0]; - n = os_read_file_k(fds[0], &c, sizeof(c)); + n = os_read_file(fds[0], &c, sizeof(c)); if(n != sizeof(c)){ printk("winch_tramp : failed to read synchronization byte\n"); printk("read failed, err = %d\n", -n); @@ -195,7 +195,7 @@ void register_winch(int fd, struct tty_struct *tty) if(thread > 0){ register_winch_irq(thread_fd, fd, thread, tty); - count = os_write_file_k(thread_fd, &c, sizeof(c)); + count = os_write_file(thread_fd, &c, sizeof(c)); if(count != sizeof(c)) printk("register_winch : failed to write " "synchronization byte, err = %d\n", |