diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 19:53:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 19:53:16 +0200 |
| commit | 9b610fda0df5d0f0b0c64242e37441ad1b384aac (patch) | |
| tree | 0ea14b15f2e6546f37fe18d8ac3dc83077ec0e55 /arch/mips/kernel/process.c | |
| parent | b8f8c3cf0a4ac0632ec3f0e15e9dc0c29de917af (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into timers/nohz
Diffstat (limited to 'arch/mips/kernel/process.c')
| -rw-r--r-- | arch/mips/kernel/process.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index bdead3aad253..b16facd9ea8e 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -125,13 +125,6 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, *childregs = *regs; childregs->regs[7] = 0; /* Clear error flag */ -#if defined(CONFIG_BINFMT_IRIX) - if (current->personality != PER_LINUX) { - /* Under IRIX things are a little different. */ - childregs->regs[3] = 1; - regs->regs[3] = 0; - } -#endif childregs->regs[2] = 0; /* Child gets zero as return value */ regs->regs[2] = p->pid; |