diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-05-06 23:51:43 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 21:13:03 +0200 |
| commit | a6ea4cceed18edebe1eb6001cb9e0f88cd741a6c (patch) | |
| tree | 4a747a92c9bd7a8703004603ee9e91f8bfb7e95a /arch/um/kernel/smp.c | |
| parent | uml: remove debugging remnants (diff) | |
| download | linux-a6ea4cceed18edebe1eb6001cb9e0f88cd741a6c.tar.xz linux-a6ea4cceed18edebe1eb6001cb9e0f88cd741a6c.zip | |
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/kernel/smp.c')
| -rw-r--r-- | arch/um/kernel/smp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c index 9ac562124654..e6a7778006ad 100644 --- a/arch/um/kernel/smp.c +++ b/arch/um/kernel/smp.c @@ -47,7 +47,7 @@ struct task_struct *idle_threads[NR_CPUS]; void smp_send_reschedule(int cpu) { - os_write_file_k(cpu_data[cpu].ipi_pipe[1], "R", 1); + os_write_file(cpu_data[cpu].ipi_pipe[1], "R", 1); num_reschedules_sent++; } @@ -59,7 +59,7 @@ void smp_send_stop(void) for(i = 0; i < num_online_cpus(); i++){ if(i == current_thread->cpu) continue; - os_write_file_k(cpu_data[i].ipi_pipe[1], "S", 1); + os_write_file(cpu_data[i].ipi_pipe[1], "S", 1); } printk("done\n"); } @@ -108,8 +108,8 @@ static struct task_struct *idle_thread(int cpu) { .pid = new_task->thread.mode.tt.extern_pid, .task = new_task } ); idle_threads[cpu] = new_task; - CHOOSE_MODE(os_write_file_k(new_task->thread.mode.tt.switch_pipe[1], &c, - sizeof(c)), + CHOOSE_MODE(os_write_file(new_task->thread.mode.tt.switch_pipe[1], &c, + sizeof(c)), ({ panic("skas mode doesn't support SMP"); })); return new_task; } @@ -179,7 +179,7 @@ void IPI_handler(int cpu) int fd; fd = cpu_data[cpu].ipi_pipe[0]; - while (os_read_file_k(fd, &c, 1) == 1) { + while (os_read_file(fd, &c, 1) == 1) { switch (c) { case 'C': smp_call_function_slave(cpu); @@ -239,7 +239,7 @@ int smp_call_function(void (*_func)(void *info), void *_info, int nonatomic, info = _info; for_each_online_cpu(i) - os_write_file_k(cpu_data[i].ipi_pipe[1], "C", 1); + os_write_file(cpu_data[i].ipi_pipe[1], "C", 1); while (atomic_read(&scf_started) != cpus) barrier(); |