diff --git a/[refs] b/[refs] index c7cc0de53904..62650d3e62bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b25d604182169a08b206306b312d2df26b5f502 +refs/heads/master: e9b04b5b67ec628a5e9a312e14b6864f8f73ba12 diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index 8f983293b403..6dd06494997a 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -2259,7 +2259,6 @@ extern struct sigqueue *sigqueue_alloc(void); extern void sigqueue_free(struct sigqueue *); extern int send_sigqueue(struct sigqueue *, struct task_struct *, int group); extern int do_sigaction(int, struct k_sigaction *, struct k_sigaction *); -extern int do_sigaltstack(const stack_t __user *, stack_t __user *, unsigned long); static inline void restore_saved_sigmask(void) { diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c index 87c09e3061d2..6919050c8156 100644 --- a/trunk/kernel/signal.c +++ b/trunk/kernel/signal.c @@ -3129,7 +3129,7 @@ int do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact) return 0; } -int +static int do_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, unsigned long sp) { stack_t oss;