uml: throw out CONFIG_MODE_TT
This patchset throws out tt mode, which has been non-functional for a while. This is done in phases, interspersed with code cleanups on the affected files. The removal is done as follows: remove all code, config options, and files which depend on CONFIG_MODE_TT get rid of the CHOOSE_MODE macro, which decided whether to call tt-mode or skas-mode code, and replace invocations with their skas portions replace all now-trivial procedures with their skas equivalents There are now a bunch of now-redundant pieces of data structures, including mode-specific pieces of the thread structure, pt_regs, and mm_context. These are all replaced with their skas-specific contents. As part of the ongoing style compliance project, I made a style pass over all files that were changed. There are three such patches, one for each phase, covering the files affected by that phase but no later ones. I noticed that we weren't freeing the LDT state associated with a process when it exited, so that's fixed in one of the later patches. The last patch is a tidying patch which I've had for a while, but which caused inexplicable crashes under tt mode. Since that is no longer a problem, this can now go in. This patch: Start getting rid of tt mode support. This patch throws out CONFIG_MODE_TT and all config options, code, and files which depend on it. CONFIG_MODE_SKAS is gone and everything that depends on it is included unconditionally. The few changed lines are in re-written Kconfig help, lines which needed something skas-related removed from them, and a few more which weren't strictly deletions. 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
a1ff5878d2
commit
42fda66387
@@ -13,9 +13,6 @@
|
||||
#include "sigcontext.h"
|
||||
#include "registers.h"
|
||||
#include "mode.h"
|
||||
|
||||
#ifdef CONFIG_MODE_SKAS
|
||||
|
||||
#include "skas.h"
|
||||
|
||||
void copy_sc(union uml_pt_regs *regs, void *from)
|
||||
@@ -108,61 +105,6 @@ int copy_sc_to_user_skas(struct sigcontext __user *to, struct _fpstate __user *t
|
||||
return copy_to_user(to, &sc, sizeof(sc)) ||
|
||||
copy_to_user(to_fp, fpregs, sizeof(fpregs));
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MODE_TT
|
||||
|
||||
/* These copy a sigcontext to/from userspace. They copy the fpstate pointer,
|
||||
* blowing away the old, good one. So, that value is saved, and then restored
|
||||
* after the sigcontext copy. In copy_from, the variable holding the saved
|
||||
* fpstate pointer, and the sigcontext that it should be restored to are both
|
||||
* in the kernel, so we can just restore using an assignment. In copy_to, the
|
||||
* saved pointer is in the kernel, but the sigcontext is in userspace, so we
|
||||
* copy_to_user it.
|
||||
*/
|
||||
int copy_sc_from_user_tt(struct sigcontext *to, struct sigcontext __user *from,
|
||||
int fpsize)
|
||||
{
|
||||
struct _fpstate *to_fp;
|
||||
struct _fpstate __user *from_fp;
|
||||
unsigned long sigs;
|
||||
int err;
|
||||
|
||||
to_fp = to->fpstate;
|
||||
sigs = to->oldmask;
|
||||
err = copy_from_user(to, from, sizeof(*to));
|
||||
from_fp = to->fpstate;
|
||||
to->oldmask = sigs;
|
||||
to->fpstate = to_fp;
|
||||
if(to_fp != NULL)
|
||||
err |= copy_from_user(to_fp, from_fp, fpsize);
|
||||
return err;
|
||||
}
|
||||
|
||||
int copy_sc_to_user_tt(struct sigcontext __user *to, struct _fpstate __user *fp,
|
||||
struct sigcontext *from, int fpsize, unsigned long sp)
|
||||
{
|
||||
struct _fpstate __user *to_fp;
|
||||
struct _fpstate *from_fp;
|
||||
int err;
|
||||
|
||||
to_fp = (fp ? fp : (struct _fpstate __user *) (to + 1));
|
||||
from_fp = from->fpstate;
|
||||
err = copy_to_user(to, from, sizeof(*to));
|
||||
|
||||
/* The SP in the sigcontext is the updated one for the signal
|
||||
* delivery. The sp passed in is the original, and this needs
|
||||
* to be restored, so we stick it in separately.
|
||||
*/
|
||||
err |= copy_to_user(&SC_SP(to), &sp, sizeof(sp));
|
||||
|
||||
if(from_fp != NULL){
|
||||
err |= copy_to_user(&to->fpstate, &to_fp, sizeof(to->fpstate));
|
||||
err |= copy_to_user(to_fp, from_fp, fpsize);
|
||||
}
|
||||
return err;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int copy_sc_from_user(struct pt_regs *to, void __user *from)
|
||||
{
|
||||
|
Reference in New Issue
Block a user