leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uml: rename os_{read_write}_file_k back to os_{read_write}_file

Browse Source 
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>
This commit is contained in:
Jeff Dike
2007-05-06 14:51:43 -07:00
committed by Linus Torvalds
parent a263672424
commit a6ea4cceed
22 changed files with 51 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/um/kernel/tt/process_kern.c
View File

@@ -57,14 +57,14 @@ void switch_to_tt(void *prev, void *next)
* nor the value in "to" (since it was the task which stole us the CPU,
* which we don't care about). */
err = os_write_file_k(to->thread.mode.tt.switch_pipe[1], &c, sizeof(c));
err = os_write_file(to->thread.mode.tt.switch_pipe[1], &c, sizeof(c));
if(err != sizeof(c))
panic("write of switch_pipe failed, err = %d", -err);
if(from->thread.mode.tt.switch_pipe[0] == -1)
os_kill_process(os_getpid(), 0);
err = os_read_file_k(from->thread.mode.tt.switch_pipe[0], &c,
err = os_read_file(from->thread.mode.tt.switch_pipe[0], &c,
sizeof(c));
if(err != sizeof(c))
panic("read of switch_pipe failed, errno = %d", -err);
@@ -114,7 +114,7 @@ void suspend_new_thread(int fd)
char c;
os_stop_process(os_getpid());
err = os_read_file_k(fd, &c, sizeof(c));
err = os_read_file(fd, &c, sizeof(c));
if(err != sizeof(c))
panic("read failed in suspend_new_thread, err = %d", -err);
}

8
arch/um/kernel/tt/ptproxy/proxy.c
View File

@@ -338,14 +338,14 @@ int start_debugger(char *prog, int startup, int stop, int *fd_out)
"err = %d\n", -fd);
exit(1);
}
os_write_file_k(fd, gdb_init_string,
sizeof(gdb_init_string) - 1);
os_write_file(fd, gdb_init_string,
sizeof(gdb_init_string) - 1);
if(startup){
if(stop){
os_write_file_k(fd, "b start_kernel\n",
os_write_file(fd, "b start_kernel\n",
strlen("b start_kernel\n"));
}
os_write_file_k(fd, "c\n", strlen("c\n"));
os_write_file(fd, "c\n", strlen("c\n"));
}
if(ptrace(PTRACE_TRACEME, 0, 0, 0) < 0){
printk("start_debugger : PTRACE_TRACEME failed, "

2
arch/um/kernel/tt/tracer.c
View File

@@ -44,7 +44,7 @@ static void tracer_winch_handler(int sig)
int n;
char c = 1;
n = os_write_file_k(tracer_winch[1], &c, sizeof(c));
n = os_write_file(tracer_winch[1], &c, sizeof(c));
if(n != sizeof(c))
printk("tracer_winch_handler - write failed, err = %d\n", -n);
}