Merge commit 'origin/master'

Manual merge of:

	arch/powerpc/Kconfig
	arch/powerpc/kernel/stacktrace.c
	arch/powerpc/mm/slice.c
	arch/ppc/kernel/smp.c

1 files changed, 0 insertions, 7 deletions

diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 2c09a442e5e5..c06f5b5d764c 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;