Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Kill off I/O cruft for R7780RP.
  sh: Revert lazy dcache writeback changes.
  sh: Enable SM501 support for RTS7751R2D.
  sh: Use L1_CACHE_BYTES for .data.cacheline_aligned.
  sysctl: Support vdso_enabled sysctl on SH.
  sh: Fix kernel thread stack corruption with preempt.
  doc: Add SH to vdso and earlyprintk in kernel-parameters.txt
  sh: Fix sigmask trampling in signal delivery.
  sh: Clear UBC when not in use.

1 files changed, 2 insertions, 3 deletions

diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index 9d6a438b3eaf..e7607366ac4e 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -250,12 +250,11 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
                 childregs->regs[15] = usp;
                 ti->addr_limit = USER_DS;
         } else {
-                childregs->regs[15] = (unsigned long)task_stack_page(p) +
-                                                        THREAD_SIZE;
+                childregs->regs[15] = (unsigned long)childregs;
                 ti->addr_limit = KERNEL_DS;
         }
 
-        if (clone_flags & CLONE_SETTLS)
+        if (clone_flags & CLONE_SETTLS)
                 childregs->gbr = childregs->regs[0];
 
         childregs->regs[0] = 0; /* Set return value for child */