diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-18 13:21:24 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-18 13:21:24 -0400 |
| commit | f9d1fe9630b94007902987c39d19f04dc6256eac (patch) | |
| tree | 1fbe757adc72469ddbc3c1e4132392164b2e0271 /include/linux/signal.h | |
| parent | 54258a8a2e81b11e486068f1cfab9fe4746b8420 (diff) | |
| parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/linux/signal.h')
| -rw-r--r-- | include/linux/signal.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/signal.h b/include/linux/signal.h index 0a98f5ec5cae..7be18b5e2fb4 100644 --- a/include/linux/signal.h +++ b/include/linux/signal.h | |||
| @@ -231,10 +231,8 @@ extern int __group_send_sig_info(int, struct siginfo *, struct task_struct *); | |||
| 231 | extern long do_sigpending(void __user *, unsigned long); | 231 | extern long do_sigpending(void __user *, unsigned long); |
| 232 | extern int sigprocmask(int, sigset_t *, sigset_t *); | 232 | extern int sigprocmask(int, sigset_t *, sigset_t *); |
| 233 | 233 | ||
| 234 | #ifndef HAVE_ARCH_GET_SIGNAL_TO_DELIVER | ||
| 235 | struct pt_regs; | 234 | struct pt_regs; |
| 236 | extern int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, struct pt_regs *regs, void *cookie); | 235 | extern int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, struct pt_regs *regs, void *cookie); |
| 237 | #endif | ||
| 238 | 236 | ||
| 239 | #endif /* __KERNEL__ */ | 237 | #endif /* __KERNEL__ */ |
| 240 | 238 | ||