Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc32: Fix thinko in previous change.
  sparc: Align clone and signal stacks to 16 bytes.

diff --combined arch/sparc/kernel/process_64.c
index c3f1cce0e95e78ec40d466fb2a82f747e1590c48,6679eebfd2e8fda21a411e8235fbd2dcd88526d8..cb70476bd8f5ccd72a6f72900195f8a74f6abfcb
--- 1/arch/sparc/kernel/process_64.c
--- 2/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@@ -365,6 -365,14 +365,6 @@@ void flush_thread(void
        struct thread_info *t = current_thread_info();
        struct mm_struct *mm;
  
 -      if (test_ti_thread_flag(t, TIF_ABI_PENDING)) {
 -              clear_ti_thread_flag(t, TIF_ABI_PENDING);
 -              if (test_ti_thread_flag(t, TIF_32BIT))
 -                      clear_ti_thread_flag(t, TIF_32BIT);
 -              else
 -                      set_ti_thread_flag(t, TIF_32BIT);
 -      }
 -
        mm = t->task->mm;
        if (mm)
                tsb_context_switch(mm);
@@@ -398,11 -406,11 +398,11 @@@ static unsigned long clone_stackframe(u
        } else
                __get_user(fp, &(((struct reg_window32 __user *)psp)->ins[6]));
  
-       /* Now 8-byte align the stack as this is mandatory in the
-        * Sparc ABI due to how register windows work.  This hides
-        * the restriction from thread libraries etc.  -DaveM
+       /* Now align the stack as this is mandatory in the Sparc ABI
+        * due to how register windows work.  This hides the
+        * restriction from thread libraries etc.
         */
-       csp &= ~7UL;
+       csp &= ~15UL;
  
        distance = fp - psp;
        rval = (csp - distance);