diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-20 13:53:16 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-20 13:53:16 -0800 |
| commit | 198d2f63a6096fe575b696b13ba61b62c620266f (patch) | |
| tree | d0c2b0697370cc670029cd1eb2a80c35c71eac60 /arch/sparc/kernel/process_64.c | |
| parent | 0da2b300b91ddeb9944c3fb4faaf78c1c482c0af (diff) | |
| parent | 1f474646fdc36b457606bbcd6a3592e6cbd31ac4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
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) } 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); |