diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-05 16:50:23 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-05 16:50:23 -0400 |
| commit | aad61439e6a00bdb72cb649e11f6e166590c5f66 (patch) | |
| tree | 2279f3c2a15f81526d14182c6acb358cafd0b359 /arch/s390/kernel/compat_signal.c | |
| parent | 3c304956755fa63ee80ca51ce38078fe1c4e8818 (diff) | |
| parent | d98550e334715b2d9e45f8f0f4e1608720108640 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'arch/s390/kernel/compat_signal.c')
| -rw-r--r-- | arch/s390/kernel/compat_signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c index 5291b5f8788d..b4c815d8ef75 100644 --- a/arch/s390/kernel/compat_signal.c +++ b/arch/s390/kernel/compat_signal.c | |||
| @@ -430,7 +430,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size) | |||
| 430 | 430 | ||
| 431 | /* This is the X/Open sanctioned signal stack switching. */ | 431 | /* This is the X/Open sanctioned signal stack switching. */ |
| 432 | if (ka->sa.sa_flags & SA_ONSTACK) { | 432 | if (ka->sa.sa_flags & SA_ONSTACK) { |
| 433 | if (! on_sig_stack(sp)) | 433 | if (! sas_ss_flags(sp)) |
| 434 | sp = current->sas_ss_sp + current->sas_ss_size; | 434 | sp = current->sas_ss_sp + current->sas_ss_size; |
| 435 | } | 435 | } |
| 436 | 436 | ||