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
@ -9,7 +9,6 @@
|
||||
#include "user.h"
|
||||
#include "mconsole.h"
|
||||
#include "os.h"
|
||||
#include "choose-mode.h"
|
||||
#include "mode.h"
|
||||
|
||||
struct dog_data {
|
||||
@ -64,7 +63,7 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
|
||||
}
|
||||
else {
|
||||
/* XXX The os_getpid() is not SMP correct */
|
||||
sprintf(pid_buf, "%d", CHOOSE_MODE(tracing_pid, os_getpid()));
|
||||
sprintf(pid_buf, "%d", os_getpid());
|
||||
args = pid_args;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user