diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-04 04:13:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-04 04:13:14 -0800 |
| commit | e35a3e9a6138c5eb67200d5f28d33cb66f0faf87 (patch) | |
| tree | d59b94da6338651349aa62a5bf0c506c3f9e8534 /include/linux | |
| parent | e315468fb49141d2737f4323f9a3d4301882ddc5 (diff) | |
| parent | da334d91ff7001d234863fc7692de1ff90bed57a (diff) | |
Merge bk://linux-pnp.bkbits.net/pnp-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/oprofile.h | 5 | ||||
| -rw-r--r-- | include/linux/sched.h | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h index 5d906c21103f..6dba9058bca0 100644 --- a/include/linux/oprofile.h +++ b/include/linux/oprofile.h @@ -46,6 +46,11 @@ struct oprofile_operations { int oprofile_arch_init(struct oprofile_operations ** ops); /** + * One-time exit/cleanup for the arch. + */ +void oprofile_arch_exit(void); + +/** * Add a sample. This may be called from any context. Pass * smp_processor_id() as cpu. */ diff --git a/include/linux/sched.h b/include/linux/sched.h index d001088e58b3..f3b4c5891898 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -541,6 +541,7 @@ extern void block_all_signals(int (*notifier)(void *priv), void *priv, extern void unblock_all_signals(void); extern void release_task(struct task_struct * p); extern int send_sig_info(int, struct siginfo *, struct task_struct *); +extern int send_group_sig_info(int, struct siginfo *, struct task_struct *); extern int force_sig_info(int, struct siginfo *, struct task_struct *); extern int __kill_pg_info(int sig, struct siginfo *info, pid_t pgrp); extern int kill_pg_info(int, struct siginfo *, pid_t); @@ -558,6 +559,11 @@ extern int kill_proc(pid_t, int, int); extern int do_sigaction(int, const struct k_sigaction *, struct k_sigaction *); extern int do_sigaltstack(const stack_t *, stack_t *, unsigned long); +/* These can be the second arg to send_sig_info/send_group_sig_info. */ +#define SEND_SIG_NOINFO ((struct siginfo *) 0) +#define SEND_SIG_PRIV ((struct siginfo *) 1) +#define SEND_SIG_FORCED ((struct siginfo *) 2) + /* True if we are on the alternate signal stack. */ static inline int on_sig_stack(unsigned long sp) |