diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 10:26:56 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 18:43:05 +0200 |
| commit | 6aa802ce6acc9b1f0b34114b3f7c21c84872cc3a (patch) | |
| tree | 74523303349693ef482dec4a1d803566b69c6abd /arch/um/drivers/harddog_user.c | |
| parent | uml: style fixes pass 1 (diff) | |
| download | linux-6aa802ce6acc9b1f0b34114b3f7c21c84872cc3a.tar.xz linux-6aa802ce6acc9b1f0b34114b3f7c21c84872cc3a.zip | |
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/drivers/harddog_user.c')
| -rw-r--r-- | arch/um/drivers/harddog_user.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c index 1171790f742c..b050e267befe 100644 --- a/arch/um/drivers/harddog_user.c +++ b/arch/um/drivers/harddog_user.c @@ -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; } |