diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-01-14 14:13:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-18 10:35:33 -0800 |
| commit | b73c67486160c59c7b96c3a7225716b41b7bf759 (patch) | |
| tree | 659508e4cd682f5b48d736356f64bf1ecbf58446 /fs | |
| parent | 514eea5e947438a05a48679085fbdfe6360917c4 (diff) | |
Make sys_pselect7 static
commit c9da9f2129d6a421c32e334a83770a9e67f7feac upstream.
Not a single architecture has wired up sys_pselect7 plus it is the
only system call with seven parameters. Just make it static and
rename it to do_pselect which will do the work for sys_pselect6.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/compat.c | 6 | ||||
| -rw-r--r-- | fs/select.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/fs/compat.c b/fs/compat.c index 075d0509970d..a76455bbb27a 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -1640,7 +1640,7 @@ sticky: } #ifdef HAVE_SET_RESTORE_SIGMASK -asmlinkage long compat_sys_pselect7(int n, compat_ulong_t __user *inp, +static long do_compat_pselect(int n, compat_ulong_t __user *inp, compat_ulong_t __user *outp, compat_ulong_t __user *exp, struct compat_timespec __user *tsp, compat_sigset_t __user *sigmask, compat_size_t sigsetsize) @@ -1748,8 +1748,8 @@ asmlinkage long compat_sys_pselect6(int n, compat_ulong_t __user *inp, (compat_size_t __user *)(sig+sizeof(up)))) return -EFAULT; } - return compat_sys_pselect7(n, inp, outp, exp, tsp, compat_ptr(up), - sigsetsize); + return do_compat_pselect(n, inp, outp, exp, tsp, compat_ptr(up), + sigsetsize); } asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds, diff --git a/fs/select.c b/fs/select.c index da0e88201c3a..dd605af52741 100644 --- a/fs/select.c +++ b/fs/select.c @@ -427,9 +427,9 @@ sticky: } #ifdef HAVE_SET_RESTORE_SIGMASK -asmlinkage long sys_pselect7(int n, fd_set __user *inp, fd_set __user *outp, - fd_set __user *exp, struct timespec __user *tsp, - const sigset_t __user *sigmask, size_t sigsetsize) +static long do_pselect(int n, fd_set __user *inp, fd_set __user *outp, + fd_set __user *exp, struct timespec __user *tsp, + const sigset_t __user *sigmask, size_t sigsetsize) { s64 timeout = MAX_SCHEDULE_TIMEOUT; sigset_t ksigmask, sigsaved; @@ -527,7 +527,7 @@ asmlinkage long sys_pselect6(int n, fd_set __user *inp, fd_set __user *outp, return -EFAULT; } - return sys_pselect7(n, inp, outp, exp, tsp, up, sigsetsize); + return do_pselect(n, inp, outp, exp, tsp, up, sigsetsize); } #endif /* HAVE_SET_RESTORE_SIGMASK */ |