diff options
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) | |||
85 | 85 | ||
86 | pty_fd = data->pty_fd; | 86 | pty_fd = data->pty_fd; |
87 | pipe_fd = data->pipe_fd; | 87 | pipe_fd = data->pipe_fd; |
88 | count = os_write_file_k(pipe_fd, &c, sizeof(c)); | 88 | count = os_write_file(pipe_fd, &c, sizeof(c)); |
89 | if(count != sizeof(c)) | 89 | if(count != sizeof(c)) |
90 | printk("winch_thread : failed to write synchronization " | 90 | printk("winch_thread : failed to write synchronization " |
91 | "byte, err = %d\n", -count); | 91 | "byte, err = %d\n", -count); |
@@ -120,7 +120,7 @@ static int winch_thread(void *arg) | |||
120 | * host - since they are not different kernel threads, we cannot use | 120 | * host - since they are not different kernel threads, we cannot use |
121 | * kernel semaphores. We don't use SysV semaphores because they are | 121 | * kernel semaphores. We don't use SysV semaphores because they are |
122 | * persistent. */ | 122 | * persistent. */ |
123 | count = os_read_file_k(pipe_fd, &c, sizeof(c)); | 123 | count = os_read_file(pipe_fd, &c, sizeof(c)); |
124 | if(count != sizeof(c)) | 124 | if(count != sizeof(c)) |
125 | printk("winch_thread : failed to read synchronization byte, " | 125 | printk("winch_thread : failed to read synchronization byte, " |
126 | "err = %d\n", -count); | 126 | "err = %d\n", -count); |
@@ -130,7 +130,7 @@ static int winch_thread(void *arg) | |||
130 | * are blocked.*/ | 130 | * are blocked.*/ |
131 | sigsuspend(&sigs); | 131 | sigsuspend(&sigs); |
132 | 132 | ||
133 | count = os_write_file_k(pipe_fd, &c, sizeof(c)); | 133 | count = os_write_file(pipe_fd, &c, sizeof(c)); |
134 | if(count != sizeof(c)) | 134 | if(count != sizeof(c)) |
135 | printk("winch_thread : write failed, err = %d\n", | 135 | printk("winch_thread : write failed, err = %d\n", |
136 | -count); | 136 | -count); |
@@ -162,7 +162,7 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out) | |||
162 | } | 162 | } |
163 | 163 | ||
164 | *fd_out = fds[0]; | 164 | *fd_out = fds[0]; |
165 | n = os_read_file_k(fds[0], &c, sizeof(c)); | 165 | n = os_read_file(fds[0], &c, sizeof(c)); |
166 | if(n != sizeof(c)){ | 166 | if(n != sizeof(c)){ |
167 | printk("winch_tramp : failed to read synchronization byte\n"); | 167 | printk("winch_tramp : failed to read synchronization byte\n"); |
168 | printk("read failed, err = %d\n", -n); | 168 | printk("read failed, err = %d\n", -n); |
@@ -195,7 +195,7 @@ void register_winch(int fd, struct tty_struct *tty) | |||
195 | if(thread > 0){ | 195 | if(thread > 0){ |
196 | register_winch_irq(thread_fd, fd, thread, tty); | 196 | register_winch_irq(thread_fd, fd, thread, tty); |
197 | 197 | ||
198 | count = os_write_file_k(thread_fd, &c, sizeof(c)); | 198 | count = os_write_file(thread_fd, &c, sizeof(c)); |
199 | if(count != sizeof(c)) | 199 | if(count != sizeof(c)) |
200 | printk("register_winch : failed to write " | 200 | printk("register_winch : failed to write " |
201 | "synchronization byte, err = %d\n", | 201 | "synchronization byte, err = %d\n", |