diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-21 00:00:25 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-21 00:00:25 -0800 |
commit | 3f6f1cd6ffb473f426858692e8e1cb82aea137eb (patch) | |
tree | d3f3f931d3ed57041dc0feafb8fdbf9843fcb5fc /arch/sparc/include/asm/compat.h | |
parent | 1443f8a0b95c07cee9df4420a30eea24123af3f3 (diff) | |
parent | b57870e28d27561ea5bad538c22b7d10f531b35c (diff) |
Merge branch 'armsoc/board' of git://github.com/hzhuang1/linux into next/boards
From Haojian Zhuang:
* 'armsoc/board' of git://github.com/hzhuang1/linux:
ARM: mmp: select pinctrl driver
+ Linux 3.7-rc6
Diffstat (limited to 'arch/sparc/include/asm/compat.h')
-rw-r--r-- | arch/sparc/include/asm/compat.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/compat.h b/arch/sparc/include/asm/compat.h index cef99fbc0a21..830502fe62b4 100644 --- a/arch/sparc/include/asm/compat.h +++ b/arch/sparc/include/asm/compat.h @@ -232,9 +232,10 @@ static inline void __user *arch_compat_alloc_user_space(long len) struct pt_regs *regs = current_thread_info()->kregs; unsigned long usp = regs->u_regs[UREG_I6]; - if (!(test_thread_flag(TIF_32BIT))) + if (test_thread_64bit_stack(usp)) usp += STACK_BIAS; - else + + if (test_thread_flag(TIF_32BIT)) usp &= 0xffffffffUL; usp -= len; |