Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6-git-rfc3542

[linux-2.6] / include / linux / signal.h

diff --git a/include/linux/signal.h b/include/linux/signal.h
index 78bfb266e4f7e0ec9df8c6bcdc9a1fc5942419d5..7be18b5e2fb41a9ec1794028a0364324360a6828 100644 (file)
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -220,15 +220,19 @@ static inline void init_sigpending(struct sigpending *sig)
        INIT_LIST_HEAD(&sig->list);
 }
 
+/* Test if 'sig' is valid signal. Use this instead of testing _NSIG directly */
+static inline int valid_signal(unsigned long sig)
+{
+       return sig <= _NSIG ? 1 : 0;
+}
+
 extern int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p);
 extern int __group_send_sig_info(int, struct siginfo *, struct task_struct *);
 extern long do_sigpending(void __user *, unsigned long);
 extern int sigprocmask(int, sigset_t *, sigset_t *);
 
-#ifndef HAVE_ARCH_GET_SIGNAL_TO_DELIVER
 struct pt_regs;
 extern int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, struct pt_regs *regs, void *cookie);
-#endif
 
 #endif /* __KERNEL__ */