diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 01:26:56 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 09:43:05 -0700 |
commit | 6aa802ce6acc9b1f0b34114b3f7c21c84872cc3a (patch) | |
tree | 74523303349693ef482dec4a1d803566b69c6abd /include/asm-um/a.out.h | |
parent | 4c9e13851315a25a705e7a686116e491041ca228 (diff) | |
download | linux-stable-6aa802ce6acc9b1f0b34114b3f7c21c84872cc3a.tar.gz linux-stable-6aa802ce6acc9b1f0b34114b3f7c21c84872cc3a.tar.bz2 linux-stable-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 'include/asm-um/a.out.h')
-rw-r--r-- | include/asm-um/a.out.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/asm-um/a.out.h b/include/asm-um/a.out.h index 78bc9eed26b2..7912f0997cbc 100644 --- a/include/asm-um/a.out.h +++ b/include/asm-um/a.out.h @@ -2,7 +2,6 @@ #define __UM_A_OUT_H #include "asm/arch/a.out.h" -#include "choose-mode.h" #undef STACK_TOP #undef STACK_TOP_MAX @@ -13,10 +12,8 @@ extern unsigned long host_task_size; #define STACK_ROOM (stacksizelim) -extern int honeypot; -#define STACK_TOP \ - CHOOSE_MODE((honeypot ? host_task_size : task_size), task_size) +#define STACK_TOP task_size -#define STACK_TOP_MAX STACK_TOP +#define STACK_TOP_MAX STACK_TOP #endif |