diff options
| author | Colin Cross <ccross@android.com> | 2010-10-21 14:52:03 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-10-21 14:52:03 -0700 |
| commit | 677151f967dc7ced6840d420f69e15ed6ed3e553 (patch) | |
| tree | a3b8e227e83909e5105920aade6adc79fdc63680 /arch/mips/kernel/signal_n32.c | |
| parent | ea63bded335543aa6855a9f2d2da836c4853a569 (diff) | |
| parent | 766197150ffa2e0fc34e852203372f0903ddd9ed (diff) | |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'arch/mips/kernel/signal_n32.c')
| -rw-r--r-- | arch/mips/kernel/signal_n32.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/mips/kernel/signal_n32.c b/arch/mips/kernel/signal_n32.c index 2c5df818c65a..ee24d814d5b9 100644 --- a/arch/mips/kernel/signal_n32.c +++ b/arch/mips/kernel/signal_n32.c @@ -109,6 +109,7 @@ asmlinkage int sysn32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs) asmlinkage void sysn32_rt_sigreturn(nabi_no_regargs struct pt_regs regs) { struct rt_sigframe_n32 __user *frame; + mm_segment_t old_fs; sigset_t set; stack_t st; s32 sp; @@ -143,7 +144,11 @@ asmlinkage void sysn32_rt_sigreturn(nabi_no_regargs struct pt_regs regs) /* It is more difficult to avoid calling this function than to call it and ignore errors. */ + old_fs = get_fs(); + set_fs(KERNEL_DS); do_sigaltstack((stack_t __user *)&st, NULL, regs.regs[29]); + set_fs(old_fs); + /* * Don't let your children do this ... |