Commit 6aa802ce authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

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: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4c9e1385

arch/um/drivers/chan_user.c

+1 −2
Original line number Diff line number Diff line
@@ -264,8 +264,7 @@ void register_winch(int fd, struct tty_struct *tty) 
		return;



	pid = tcgetpgrp(fd);

	if (!CHOOSE_MODE_PROC(is_tracer_winch, is_skas_winch, pid, fd, tty) &&

	    (pid == -1)) {

	if (!is_skas_winch(pid, fd, tty) && (pid == -1)) {

		thread = winch_tramp(fd, tty, &thread_fd, &stack);

		if (thread < 0)

			return;

arch/um/drivers/harddog_user.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

	}

arch/um/drivers/mconsole_kern.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include "init.h"

#include "os.h"

#include "irq_kern.h"

#include "choose-mode.h"



static int do_unlink_socket(struct notifier_block *notifier,

			    unsigned long what, void *data)

arch/um/include/choose-mode.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/* 

 * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)

 * Licensed under the GPL

 */



#ifndef __CHOOSE_MODE_H__

#define __CHOOSE_MODE_H__



#include "uml-config.h"



#define CHOOSE_MODE(tt, skas) (skas)



#define CHOOSE_MODE_PROC(tt, skas, args...) \

	CHOOSE_MODE(tt(args), skas(args))



#ifndef __CHOOSE_MODE

#define __CHOOSE_MODE(tt, skas) CHOOSE_MODE(tt, skas)

#endif



#endif

arch/um/include/skas/uaccess-skas.h

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)

 * Licensed under the GPL

 */



#ifndef __SKAS_UACCESS_H

#define __SKAS_UACCESS_H



#include "asm/errno.h"



/* No SKAS-specific checking. */

#define access_ok_skas(type, addr, size) 0



extern int copy_from_user_skas(void *to, const void __user *from, int n);

extern int copy_to_user_skas(void __user *to, const void *from, int n);

extern int strncpy_from_user_skas(char *dst, const char __user *src, int count);

extern int __clear_user_skas(void __user *mem, int len);

extern int clear_user_skas(void __user *mem, int len);

extern int strnlen_user_skas(const void __user *str, int len);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE