summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-10 15:30:02 (GMT)
committerJeff Garzik <jgarzik@pobox.com>2006-02-10 15:30:02 (GMT)
commitc5014de8a74f442a4441f21f690d8aae5dc8b432 (patch)
treee4506970292dfb345fbc151481ce6918f9d36925 /include/linux
parentcc9278ed5e992122a654a3f762561ee5e013810f (diff)
parent5bc159e6cb7ca8d173195919ee935885c129011e (diff)
downloadlinux-fsl-qoriq-c5014de8a74f442a4441f21f690d8aae5dc8b432.tar.xz
Merge branch 'master'
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/sched.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 0cfcd1c..9c1da02 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1098,7 +1098,7 @@ extern struct sigqueue *sigqueue_alloc(void);
extern void sigqueue_free(struct sigqueue *);
extern int send_sigqueue(int, struct sigqueue *, struct task_struct *);
extern int send_group_sigqueue(int, struct sigqueue *, struct task_struct *);
-extern int do_sigaction(int, const struct k_sigaction *, struct k_sigaction *);
+extern int do_sigaction(int, struct k_sigaction *, struct k_sigaction *);
extern int do_sigaltstack(const stack_t __user *, stack_t __user *, unsigned long);
/* These can be the second arg to send_sig_info/send_group_sig_info. */