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
@@ -320,11 +320,6 @@ static int init_aio(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
CHOOSE_MODE(({ if(!aio_24){
|
||||
printk("Disabling 2.6 AIO in tt mode\n");
|
||||
aio_24 = 1;
|
||||
} }), (void) 0);
|
||||
|
||||
if(!aio_24){
|
||||
err = init_aio_26();
|
||||
if(err && (errno == ENOSYS)){
|
||||
|
Reference in New Issue
Block a user