diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 04:26:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:05 -0400 |
commit | 6aa802ce6acc9b1f0b34114b3f7c21c84872cc3a (patch) | |
tree | 74523303349693ef482dec4a1d803566b69c6abd /arch/um/kernel/reboot.c | |
parent | 4c9e13851315a25a705e7a686116e491041ca228 (diff) |
uml: throw out CHOOSE_MODE
The next stage after removing code which depends on CONFIG_MODE_TT is removing
the CHOOSE_MODE abstraction, which provided both compile-time and run-time
branching to either tt-mode or skas-mode code.
This patch removes choose-mode.h and all inclusions of it, and replaces all
CHOOSE_MODE invocations with the skas branch. This leaves a number of trivial
functions which will be dealt with in a later patch.
There are some changes in the uaccess and tls support which go somewhat beyond
this and eliminate some of the now-redundant functions.
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/kernel/reboot.c')
-rw-r--r-- | arch/um/kernel/reboot.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/um/kernel/reboot.c b/arch/um/kernel/reboot.c index 93df0672d022..4a0def32e323 100644 --- a/arch/um/kernel/reboot.c +++ b/arch/um/kernel/reboot.c | |||
@@ -10,13 +10,12 @@ | |||
10 | #include "kern.h" | 10 | #include "kern.h" |
11 | #include "os.h" | 11 | #include "os.h" |
12 | #include "mode.h" | 12 | #include "mode.h" |
13 | #include "choose-mode.h" | ||
14 | 13 | ||
15 | void (*pm_power_off)(void); | 14 | void (*pm_power_off)(void); |
16 | 15 | ||
17 | static void kill_off_processes(void) | 16 | static void kill_off_processes(void) |
18 | { | 17 | { |
19 | CHOOSE_MODE(kill_off_processes_tt(), kill_off_processes_skas()); | 18 | kill_off_processes_skas(); |
20 | } | 19 | } |
21 | 20 | ||
22 | void uml_cleanup(void) | 21 | void uml_cleanup(void) |
@@ -29,13 +28,13 @@ void uml_cleanup(void) | |||
29 | void machine_restart(char * __unused) | 28 | void machine_restart(char * __unused) |
30 | { | 29 | { |
31 | uml_cleanup(); | 30 | uml_cleanup(); |
32 | CHOOSE_MODE(reboot_tt(), reboot_skas()); | 31 | reboot_skas(); |
33 | } | 32 | } |
34 | 33 | ||
35 | void machine_power_off(void) | 34 | void machine_power_off(void) |
36 | { | 35 | { |
37 | uml_cleanup(); | 36 | uml_cleanup(); |
38 | CHOOSE_MODE(halt_tt(), halt_skas()); | 37 | halt_skas(); |
39 | } | 38 | } |
40 | 39 | ||
41 | void machine_halt(void) | 40 | void machine_halt(void) |