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>
This commit is contained in:
committed by
Linus Torvalds
parent
4c9e138513
commit
6aa802ce6a
@@ -10,13 +10,12 @@
|
||||
#include "kern.h"
|
||||
#include "os.h"
|
||||
#include "mode.h"
|
||||
#include "choose-mode.h"
|
||||
|
||||
void (*pm_power_off)(void);
|
||||
|
||||
static void kill_off_processes(void)
|
||||
{
|
||||
CHOOSE_MODE(kill_off_processes_tt(), kill_off_processes_skas());
|
||||
kill_off_processes_skas();
|
||||
}
|
||||
|
||||
void uml_cleanup(void)
|
||||
@@ -29,13 +28,13 @@ void uml_cleanup(void)
|
||||
void machine_restart(char * __unused)
|
||||
{
|
||||
uml_cleanup();
|
||||
CHOOSE_MODE(reboot_tt(), reboot_skas());
|
||||
reboot_skas();
|
||||
}
|
||||
|
||||
void machine_power_off(void)
|
||||
{
|
||||
uml_cleanup();
|
||||
CHOOSE_MODE(halt_tt(), halt_skas());
|
||||
halt_skas();
|
||||
}
|
||||
|
||||
void machine_halt(void)
|
||||
|
Reference in New Issue
Block a user