diff options
| author | jdike <jdike> | 2003-11-10 22:56:26 +0000 |
|---|---|---|
| committer | jdike <jdike> | 2003-11-10 22:56:26 +0000 |
| commit | b85d4aed0700ce709a6ae14e84c34a260669ff3d (patch) | |
| tree | 4b8160e945b7b4f04b1de199d9ad7fbb46d46a67 | |
| parent | 67f4a427cf96ca6df6cdf25f245c57bd7e415892 (diff) | |
| download | uml-history-b85d4aed0700ce709a6ae14e84c34a260669ff3d.tar.gz | |
Cleanup.
| -rw-r--r-- | arch/um/drivers/chan_user.c | 4 | ||||
| -rw-r--r-- | arch/um/kernel/syscall_kern.c | 2 | ||||
| -rw-r--r-- | include/asm-um/processor-generic.h | 32 |
3 files changed, 16 insertions, 22 deletions
diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c index 6874489..7319ddd 100644 --- a/arch/um/drivers/chan_user.c +++ b/arch/um/drivers/chan_user.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com) + * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com) * Licensed under the GPL */ @@ -39,7 +39,7 @@ int generic_read(int fd, char *c_out, void *unused) return(n); } -/* XXX Trivial wrapper arounf os_write_file */ +/* XXX Trivial wrapper around os_write_file */ int generic_write(int fd, const char *buf, int n, void *unused) { diff --git a/arch/um/kernel/syscall_kern.c b/arch/um/kernel/syscall_kern.c index 9d399cb..3ba911d 100644 --- a/arch/um/kernel/syscall_kern.c +++ b/arch/um/kernel/syscall_kern.c @@ -135,7 +135,7 @@ int sys_pipe(unsigned long * fildes) error = do_pipe(fd); if (!error) { - if (copy_to_user(fildes, fd, 2*sizeof(int))) + if (copy_to_user(fildes, fd, sizeof(fd))) error = -EFAULT; } return error; diff --git a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h index c38984e..a18d428 100644 --- a/include/asm-um/processor-generic.h +++ b/include/asm-um/processor-generic.h @@ -22,23 +22,6 @@ struct mm_struct; #define cpu_relax() do ; while (0) -#ifdef CONFIG_MODE_TT -struct proc_tt_mode { - int extern_pid; - int tracing; - int switch_pipe[2]; - int singlestep_syscall; - int vm_seq; -}; -#endif - -#ifdef CONFIG_MODE_SKAS -struct proc_skas_mode { - void *switch_buf; - void *fork_buf; -}; -#endif - struct thread_struct { int forking; unsigned long kernel_stack; @@ -46,6 +29,7 @@ struct thread_struct { struct pt_regs regs; unsigned long cr2; int err; + unsigned long trap_no; void *fault_addr; void *fault_catcher; struct task_struct *prev_sched; @@ -54,10 +38,20 @@ struct thread_struct { struct arch_thread arch; union { #ifdef CONFIG_MODE_TT - struct proc_tt_mode tt; + struct { + int extern_pid; + int tracing; + int switch_pipe[2]; + int singlestep_syscall; + int vm_seq; + } tt; #endif #ifdef CONFIG_MODE_SKAS - struct proc_skas_mode skas; + struct { + void *switch_buf; + void *fork_buf; + int mm_count; + } skas; #endif } mode; struct { |