Module: xenomai-3 Branch: next Commit: 091ddb5bfda22cf9cc9e363a9d03beb9d3090200 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=091ddb5bfda22cf9cc9e363a9d03beb9d3090200
Author: Philippe Gerum <r...@xenomai.org> Date: Tue Oct 28 10:37:06 2014 +0100 cobalt/posix/signal: fixup sigpending() prototype --- kernel/cobalt/posix/signal.c | 4 ++-- kernel/cobalt/posix/signal.h | 2 +- kernel/cobalt/posix/syscall32.c | 6 +++--- kernel/cobalt/posix/syscall32.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/cobalt/posix/signal.c b/kernel/cobalt/posix/signal.c index 94d87d6..83f03fd 100644 --- a/kernel/cobalt/posix/signal.c +++ b/kernel/cobalt/posix/signal.c @@ -451,10 +451,10 @@ COBALT_SYSCALL(sigwaitinfo, nonrestartable, return __cobalt_sigwaitinfo(&set, u_si, signal_put_siginfo); } -COBALT_SYSCALL(sigpending, primary, int, (sigset_t __user *u_set)) +COBALT_SYSCALL(sigpending, primary, int, (old_sigset_t __user *u_set)) { struct cobalt_thread *curr = cobalt_current_thread(); - + return __xn_safe_copy_to_user(u_set, &curr->sigpending, sizeof(*u_set)); } diff --git a/kernel/cobalt/posix/signal.h b/kernel/cobalt/posix/signal.h index 9f4c972..75c5a2a 100644 --- a/kernel/cobalt/posix/signal.h +++ b/kernel/cobalt/posix/signal.h @@ -106,7 +106,7 @@ COBALT_SYSCALL_DECL(sigwaitinfo, struct siginfo __user *u_si)); COBALT_SYSCALL_DECL(sigpending, - int, (sigset_t __user *u_set)); + int, (old_sigset_t __user *u_set)); COBALT_SYSCALL_DECL(kill, int, (pid_t pid, int sig)); diff --git a/kernel/cobalt/posix/syscall32.c b/kernel/cobalt/posix/syscall32.c index a9b0ade..3074a3a 100644 --- a/kernel/cobalt/posix/syscall32.c +++ b/kernel/cobalt/posix/syscall32.c @@ -577,11 +577,11 @@ COBALT_SYSCALL32emu(sigwaitinfo, nonrestartable, return __cobalt_sigwaitinfo(&set, u_si, sys32_put_siginfo); } -COBALT_SYSCALL32emu(sigpending, primary, int, (compat_sigset_t __user *u_set)) +COBALT_SYSCALL32emu(sigpending, primary, int, (compat_old_sigset_t __user *u_set)) { struct cobalt_thread *curr = cobalt_current_thread(); - - return sys32_put_sigset(u_set, &curr->sigpending); + + return sys32_put_sigset((compat_sigset_t *)u_set, &curr->sigpending); } COBALT_SYSCALL32emu(sigqueue, conforming, diff --git a/kernel/cobalt/posix/syscall32.h b/kernel/cobalt/posix/syscall32.h index f1ebaec..c759820 100644 --- a/kernel/cobalt/posix/syscall32.h +++ b/kernel/cobalt/posix/syscall32.h @@ -142,7 +142,7 @@ COBALT_SYSCALL32emu_DECL(sigwaitinfo, struct compat_siginfo __user *u_si)); COBALT_SYSCALL32emu_DECL(sigpending, - int, (compat_sigset_t __user *u_set)); + int, (compat_old_sigset_t __user *u_set)); COBALT_SYSCALL32emu_DECL(sigqueue, int, (pid_t pid, int sig, _______________________________________________ Xenomai-git mailing list Xenomai-git@xenomai.org http://www.xenomai.org/mailman/listinfo/xenomai-git