diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
| commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
| tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /include/linux/tracehook.h | |
| parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
| parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'include/linux/tracehook.h')
| -rw-r--r-- | include/linux/tracehook.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h index 3a2e66d88a32..ebcfa4ebdbf8 100644 --- a/include/linux/tracehook.h +++ b/include/linux/tracehook.h | |||
| @@ -169,7 +169,7 @@ static inline int tracehook_unsafe_exec(struct task_struct *task) | |||
| 169 | * tracehook_tracer_task - return the task that is tracing the given task | 169 | * tracehook_tracer_task - return the task that is tracing the given task |
| 170 | * @tsk: task to consider | 170 | * @tsk: task to consider |
| 171 | * | 171 | * |
| 172 | * Returns NULL if noone is tracing @task, or the &struct task_struct | 172 | * Returns NULL if no one is tracing @task, or the &struct task_struct |
| 173 | * pointer to its tracer. | 173 | * pointer to its tracer. |
| 174 | * | 174 | * |
| 175 | * Must called under rcu_read_lock(). The pointer returned might be kept | 175 | * Must called under rcu_read_lock(). The pointer returned might be kept |
| @@ -448,7 +448,7 @@ static inline int tracehook_force_sigpending(void) | |||
| 448 | * | 448 | * |
| 449 | * Return zero to check for a real pending signal normally. | 449 | * Return zero to check for a real pending signal normally. |
| 450 | * Return -1 after releasing the siglock to repeat the check. | 450 | * Return -1 after releasing the siglock to repeat the check. |
| 451 | * Return a signal number to induce an artifical signal delivery, | 451 | * Return a signal number to induce an artificial signal delivery, |
| 452 | * setting *@info and *@return_ka to specify its details and behavior. | 452 | * setting *@info and *@return_ka to specify its details and behavior. |
| 453 | * | 453 | * |
| 454 | * The @return_ka->sa_handler value controls the disposition of the | 454 | * The @return_ka->sa_handler value controls the disposition of the |