diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 04:26:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:05 -0400 |
commit | 77bf4400319db9d2a8af6b00c2be6faa0f3d07cb (patch) | |
tree | ddc8fd48349b8d4dd2c0b26bce7f52f79b4e4077 /include/asm-um/processor-generic.h | |
parent | ae2587e41254e48e670346aefa332d7469d86352 (diff) |
uml: remove code made redundant by CHOOSE_MODE removal
This patch makes a number of simplifications enabled by the removal of
CHOOSE_MODE. There were lots of functions that looked like
int foo(args){
foo_skas(args);
}
The bodies of foo_skas are now folded into foo, and their declarations (and
sometimes entire header files) are deleted.
In addition, the union uml_pt_regs, which was a union between the tt and skas
register formats, is now a struct, with the tt-mode arm of the union being
removed.
It turns out that usr2_handler was unused, so it is gone.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-um/processor-generic.h')
-rw-r--r-- | include/asm-um/processor-generic.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h index be3ffec3a6a6..126df73f5401 100644 --- a/include/asm-um/processor-generic.h +++ b/include/asm-um/processor-generic.h | |||
@@ -32,12 +32,8 @@ struct thread_struct { | |||
32 | unsigned long temp_stack; | 32 | unsigned long temp_stack; |
33 | void *exec_buf; | 33 | void *exec_buf; |
34 | struct arch_thread arch; | 34 | struct arch_thread arch; |
35 | union { | 35 | jmp_buf switch_buf; |
36 | struct { | 36 | int mm_count; |
37 | jmp_buf switch_buf; | ||
38 | int mm_count; | ||
39 | } skas; | ||
40 | } mode; | ||
41 | struct { | 37 | struct { |
42 | int op; | 38 | int op; |
43 | union { | 39 | union { |
@@ -75,7 +71,10 @@ typedef struct { | |||
75 | 71 | ||
76 | extern struct task_struct *alloc_task_struct(void); | 72 | extern struct task_struct *alloc_task_struct(void); |
77 | 73 | ||
78 | extern void release_thread(struct task_struct *); | 74 | static inline void release_thread(struct task_struct *task) |
75 | { | ||
76 | } | ||
77 | |||
79 | extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags); | 78 | extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags); |
80 | 79 | ||
81 | static inline void prepare_to_copy(struct task_struct *tsk) | 80 | static inline void prepare_to_copy(struct task_struct *tsk) |
@@ -125,8 +124,7 @@ extern struct cpuinfo_um cpu_data[]; | |||
125 | #endif | 124 | #endif |
126 | 125 | ||
127 | 126 | ||
128 | #define KSTK_REG(tsk, reg) \ | 127 | #define KSTK_REG(tsk, reg) get_thread_reg(reg, &tsk->thread.switch_buf) |
129 | get_thread_reg(reg, &tsk->thread.mode.skas.switch_buf) | ||
130 | #define get_wchan(p) (0) | 128 | #define get_wchan(p) (0) |
131 | 129 | ||
132 | #endif | 130 | #endif |