diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-25 13:32:58 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 15:09:19 -0500 |
| commit | 322a56cb1fcbe228eee5cdb8a9c6df9f797d998c (patch) | |
| tree | feedbad82fdfacf9f4d5ddd343905f6057a71fee /kernel/compat.c | |
| parent | ad4b65a434bdd2ff37d095ab1ccd836203e985ba (diff) | |
| download | olio-linux-3.10-322a56cb1fcbe228eee5cdb8a9c6df9f797d998c.tar.xz olio-linux-3.10-322a56cb1fcbe228eee5cdb8a9c6df9f797d998c.zip | |
generic compat_sys_rt_sigprocmask()
conditional on GENERIC_COMPAT_RT_SIGPROCMASK; by the end of that series
it will become the same thing as COMPAT and conditional will die out.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel/compat.c')
| -rw-r--r-- | kernel/compat.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/kernel/compat.c b/kernel/compat.c index 0c07d435254..e2a9c478598 100644 --- a/kernel/compat.c +++ b/kernel/compat.c @@ -971,7 +971,7 @@ long compat_put_bitmap(compat_ulong_t __user *umask, unsigned long *mask, } void -sigset_from_compat (sigset_t *set, compat_sigset_t *compat) +sigset_from_compat(sigset_t *set, const compat_sigset_t *compat) { switch (_NSIG_WORDS) { case 4: set->sig[3] = compat->sig[6] | (((long)compat->sig[7]) << 32 ); @@ -982,6 +982,17 @@ sigset_from_compat (sigset_t *set, compat_sigset_t *compat) } EXPORT_SYMBOL_GPL(sigset_from_compat); +void +sigset_to_compat(compat_sigset_t *compat, const sigset_t *set) +{ + switch (_NSIG_WORDS) { + case 4: compat->sig[7] = (set->sig[3] >> 32); compat->sig[6] = set->sig[3]; + case 3: compat->sig[5] = (set->sig[2] >> 32); compat->sig[4] = set->sig[2]; + case 2: compat->sig[3] = (set->sig[1] >> 32); compat->sig[2] = set->sig[1]; + case 1: compat->sig[1] = (set->sig[0] >> 32); compat->sig[0] = set->sig[0]; + } +} + asmlinkage long compat_sys_rt_sigtimedwait (compat_sigset_t __user *uthese, struct compat_siginfo __user *uinfo, |