diff options
author | jdike <jdike> | 2003-04-24 16:47:58 +0000 |
---|---|---|
committer | jdike <jdike> | 2003-04-24 16:47:58 +0000 |
commit | fbdcea28d49217caed60714d591f74e929cd7f24 (patch) | |
tree | ef54d1dbd2b1f7063a98b51911e5934740e77a9f | |
parent | 43205052b9b42cf5b9e1428be63183e57a650318 (diff) | |
download | uml-history-fbdcea28d49217caed60714d591f74e929cd7f24.tar.gz |
Removed some duplicate declarations.
Added strlen_user_proc.
-rw-r--r-- | arch/um/include/kern_util.h | 3 | ||||
-rw-r--r-- | arch/um/kernel/process_kern.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h index 3ba5db8..26627ee 100644 --- a/arch/um/include/kern_util.h +++ b/arch/um/include/kern_util.h @@ -62,7 +62,6 @@ extern int hz(void); extern void idle_timer(void); extern unsigned int do_IRQ(int irq, union uml_pt_regs *regs); extern int external_pid(void *t); -extern int pid_to_processor_id(int pid); extern void boot_timer_handler(int sig); extern void interrupt_end(void); extern void initial_thread_cb(void (*proc)(void *), void *arg); @@ -87,7 +86,6 @@ extern void unprotect_kernel_mem(void); extern void protect_kernel_mem(void); extern void set_kmem_end(unsigned long); extern void uml_cleanup(void); -extern int pid_to_processor_id(int pid); extern void set_current(void *t); extern void lock_signalled_task(void *t); extern void IPI_handler(int cpu); @@ -96,6 +94,7 @@ extern void *get_init_task(void); extern int clear_user_proc(void *buf, int size); extern int copy_to_user_proc(void *to, void *from, int size); extern int copy_from_user_proc(void *to, void *from, int size); +extern int strlen_user_proc(char *str); extern void bus_handler(int sig, union uml_pt_regs *regs); extern void winch(int sig, union uml_pt_regs *regs); extern long execute_syscall(void *r); diff --git a/arch/um/kernel/process_kern.c b/arch/um/kernel/process_kern.c index 74f9655..654f028 100644 --- a/arch/um/kernel/process_kern.c +++ b/arch/um/kernel/process_kern.c @@ -352,6 +352,11 @@ int clear_user_proc(void *buf, int size) return(clear_user(buf, size)); } +int strlen_user_proc(char *str) +{ + return(strlen_user(str)); +} + int smp_sigio_handler(void) { #ifdef CONFIG_SMP |