diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-11 17:00:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-11 17:00:27 -0500 |
| commit | f2d6cff7f5255985939fb752daee4fab397ed61d (patch) | |
| tree | 0dee8087cce187ad3272f9cc18457e879ffd78c9 /arch/sparc/kernel/process_64.c | |
| parent | 803bf5ec259941936262d10ecc84511b76a20921 (diff) | |
| parent | 440ab7ac2d6b735fb278a1ff1674f6716314c6bb (diff) | |
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.
Diffstat (limited to 'arch/sparc/kernel/process_64.c')
| -rw-r--r-- | arch/sparc/kernel/process_64.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c index c3f1cce0e95e..cb70476bd8f5 100644 --- a/arch/sparc/kernel/process_64.c +++ b/arch/sparc/kernel/process_64.c | |||
| @@ -398,11 +398,11 @@ static unsigned long clone_stackframe(unsigned long csp, unsigned long psp) | |||
| 398 | } else | 398 | } else |
| 399 | __get_user(fp, &(((struct reg_window32 __user *)psp)->ins[6])); | 399 | __get_user(fp, &(((struct reg_window32 __user *)psp)->ins[6])); |
| 400 | 400 | ||
| 401 | /* Now 8-byte align the stack as this is mandatory in the | 401 | /* Now align the stack as this is mandatory in the Sparc ABI |
| 402 | * Sparc ABI due to how register windows work. This hides | 402 | * due to how register windows work. This hides the |
| 403 | * the restriction from thread libraries etc. -DaveM | 403 | * restriction from thread libraries etc. |
| 404 | */ | 404 | */ |
| 405 | csp &= ~7UL; | 405 | csp &= ~15UL; |
| 406 | 406 | ||
| 407 | distance = fp - psp; | 407 | distance = fp - psp; |
| 408 | rval = (csp - distance); | 408 | rval = (csp - distance); |