diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-12 06:28:26 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-12 06:28:26 +0400 |
| commit | f8b06550509fd68f673dc4ced482d2faa8efb531 (patch) | |
| tree | 149851e7887443d42251d4b84f2c65112efe09cb /arch/sparc/math-emu/math_64.c | |
| parent | fb7d2ebd217a2a3cead4402b47c65c25881a2f75 (diff) | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| download | linux-f8b06550509fd68f673dc4ced482d2faa8efb531.tar.xz | |
Merge 3.7-rc5 into staging-next
Diffstat (limited to 'arch/sparc/math-emu/math_64.c')
| -rw-r--r-- | arch/sparc/math-emu/math_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/math-emu/math_64.c b/arch/sparc/math-emu/math_64.c index 1704068da928..034aadbff036 100644 --- a/arch/sparc/math-emu/math_64.c +++ b/arch/sparc/math-emu/math_64.c @@ -320,7 +320,7 @@ int do_mathemu(struct pt_regs *regs, struct fpustate *f, bool illegal_insn_trap) XR = 0; else if (freg < 16) XR = regs->u_regs[freg]; - else if (test_thread_flag(TIF_32BIT)) { + else if (!test_thread_64bit_stack(regs->u_regs[UREG_FP])) { struct reg_window32 __user *win32; flushw_user (); win32 = (struct reg_window32 __user *)((unsigned long)((u32)regs->u_regs[UREG_FP])); |