diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 04:26:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:05 -0400 |
commit | 42fda66387daa53538ae13a2c858396aaf037158 (patch) | |
tree | 77955a91a958fde7be47cb0ff23ac9e1248217db /arch/um/include/os.h | |
parent | a1ff5878d2628bbe1e42821c024c96f48318f683 (diff) |
uml: throw out CONFIG_MODE_TT
This patchset throws out tt mode, which has been non-functional for a while.
This is done in phases, interspersed with code cleanups on the affected files.
The removal is done as follows:
remove all code, config options, and files which depend on
CONFIG_MODE_TT
get rid of the CHOOSE_MODE macro, which decided whether to
call tt-mode or skas-mode code, and replace invocations with their
skas portions
replace all now-trivial procedures with their skas equivalents
There are now a bunch of now-redundant pieces of data structures, including
mode-specific pieces of the thread structure, pt_regs, and mm_context. These
are all replaced with their skas-specific contents.
As part of the ongoing style compliance project, I made a style pass over all
files that were changed. There are three such patches, one for each phase,
covering the files affected by that phase but no later ones.
I noticed that we weren't freeing the LDT state associated with a process when
it exited, so that's fixed in one of the later patches.
The last patch is a tidying patch which I've had for a while, but which caused
inexplicable crashes under tt mode. Since that is no longer a problem, this
can now go in.
This patch:
Start getting rid of tt mode support.
This patch throws out CONFIG_MODE_TT and all config options, code, and files
which depend on it.
CONFIG_MODE_SKAS is gone and everything that depends on it is included
unconditionally.
The few changed lines are in re-written Kconfig help, lines which needed
something skas-related removed from them, and a few more which weren't
strictly deletions.
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 'arch/um/include/os.h')
-rw-r--r-- | arch/um/include/os.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index c0803e67fc67..208d9b91fc93 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h | |||
@@ -178,11 +178,7 @@ extern void check_host_supports_tls(int *supports_tls, int *tls_min); | |||
178 | 178 | ||
179 | /* Make sure they are clear when running in TT mode. Required by | 179 | /* Make sure they are clear when running in TT mode. Required by |
180 | * SEGV_MAYBE_FIXABLE */ | 180 | * SEGV_MAYBE_FIXABLE */ |
181 | #ifdef UML_CONFIG_MODE_SKAS | ||
182 | #define clear_can_do_skas() do { ptrace_faultinfo = proc_mm = 0; } while (0) | 181 | #define clear_can_do_skas() do { ptrace_faultinfo = proc_mm = 0; } while (0) |
183 | #else | ||
184 | #define clear_can_do_skas() do {} while (0) | ||
185 | #endif | ||
186 | 182 | ||
187 | /* mem.c */ | 183 | /* mem.c */ |
188 | extern int create_mem_file(unsigned long long len); | 184 | extern int create_mem_file(unsigned long long len); |
@@ -193,18 +189,11 @@ extern int os_process_parent(int pid); | |||
193 | extern void os_stop_process(int pid); | 189 | extern void os_stop_process(int pid); |
194 | extern void os_kill_process(int pid, int reap_child); | 190 | extern void os_kill_process(int pid, int reap_child); |
195 | extern void os_kill_ptraced_process(int pid, int reap_child); | 191 | extern void os_kill_ptraced_process(int pid, int reap_child); |
196 | #ifdef UML_CONFIG_MODE_TT | ||
197 | extern void os_usr1_process(int pid); | ||
198 | #endif | ||
199 | extern long os_ptrace_ldt(long pid, long addr, long data); | 192 | extern long os_ptrace_ldt(long pid, long addr, long data); |
200 | 193 | ||
201 | extern int os_getpid(void); | 194 | extern int os_getpid(void); |
202 | extern int os_getpgrp(void); | 195 | extern int os_getpgrp(void); |
203 | 196 | ||
204 | #ifdef UML_CONFIG_MODE_TT | ||
205 | extern void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int)); | ||
206 | extern void stop(void); | ||
207 | #endif | ||
208 | extern void init_new_thread_signals(void); | 197 | extern void init_new_thread_signals(void); |
209 | extern int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr); | 198 | extern int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr); |
210 | 199 | ||
@@ -217,18 +206,6 @@ extern int os_drop_memory(void *addr, int length); | |||
217 | extern int can_drop_memory(void); | 206 | extern int can_drop_memory(void); |
218 | extern void os_flush_stdout(void); | 207 | extern void os_flush_stdout(void); |
219 | 208 | ||
220 | /* tt.c | ||
221 | * for tt mode only (will be deleted in future...) | ||
222 | */ | ||
223 | extern void forward_ipi(int fd, int pid); | ||
224 | extern void kill_child_dead(int pid); | ||
225 | extern int wait_for_stop(int pid, int sig, int cont_type, void *relay); | ||
226 | extern int protect_memory(unsigned long addr, unsigned long len, | ||
227 | int r, int w, int x, int must_succeed); | ||
228 | extern void forward_pending_sigio(int target); | ||
229 | extern int start_fork_tramp(void *arg, unsigned long temp_stack, | ||
230 | int clone_flags, int (*tramp)(void *)); | ||
231 | |||
232 | /* uaccess.c */ | 209 | /* uaccess.c */ |
233 | extern unsigned long __do_user_copy(void *to, const void *from, int n, | 210 | extern unsigned long __do_user_copy(void *to, const void *from, int n, |
234 | void **fault_addr, void **fault_catcher, | 211 | void **fault_addr, void **fault_catcher, |
@@ -281,9 +258,6 @@ extern void os_dump_core(void); | |||
281 | extern void switch_timers(int to_real); | 258 | extern void switch_timers(int to_real); |
282 | extern void idle_sleep(int secs); | 259 | extern void idle_sleep(int secs); |
283 | extern int set_interval(int is_virtual); | 260 | extern int set_interval(int is_virtual); |
284 | #ifdef CONFIG_MODE_TT | ||
285 | extern void enable_timer(void); | ||
286 | #endif | ||
287 | extern void disable_timer(void); | 261 | extern void disable_timer(void); |
288 | extern void uml_idle_timer(void); | 262 | extern void uml_idle_timer(void); |
289 | extern unsigned long long os_nsecs(void); | 263 | extern unsigned long long os_nsecs(void); |