diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-02-14 22:36:31 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-02-14 22:36:31 -0500 |
| commit | 0ed3f64ec3a7ad29e83e03607115eeffa32f553c (patch) | |
| tree | 528681b043e947cfc51527d56098f586b6dfa217 /arch/mips/kernel/signal32.c | |
| parent | 5815449d1bfcb22f74b0e36a8b0631d6584cb7fc (diff) | |
| parent | 10ee39fe3ff618d274e1cd0f6abbc2917b736bfd (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/mips/kernel/signal32.c')
| -rw-r--r-- | arch/mips/kernel/signal32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c index da3271e1fdac..8a8b8dd90417 100644 --- a/arch/mips/kernel/signal32.c +++ b/arch/mips/kernel/signal32.c | |||
| @@ -537,7 +537,7 @@ _sys32_rt_sigreturn(nabi_no_regargs struct pt_regs regs) | |||
| 537 | /* The ucontext contains a stack32_t, so we must convert! */ | 537 | /* The ucontext contains a stack32_t, so we must convert! */ |
| 538 | if (__get_user(sp, &frame->rs_uc.uc_stack.ss_sp)) | 538 | if (__get_user(sp, &frame->rs_uc.uc_stack.ss_sp)) |
| 539 | goto badframe; | 539 | goto badframe; |
| 540 | st.ss_size = (long) sp; | 540 | st.ss_sp = (void *)(long) sp; |
| 541 | if (__get_user(st.ss_size, &frame->rs_uc.uc_stack.ss_size)) | 541 | if (__get_user(st.ss_size, &frame->rs_uc.uc_stack.ss_size)) |
| 542 | goto badframe; | 542 | goto badframe; |
| 543 | if (__get_user(st.ss_flags, &frame->rs_uc.uc_stack.ss_flags)) | 543 | if (__get_user(st.ss_flags, &frame->rs_uc.uc_stack.ss_flags)) |