diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
| commit | bb799d3b980eb803ca2da4a4eefbd9308f8d988a (patch) | |
| tree | 69fbe0cd6d47b23a50f5e1d87bf7489532fae149 /security/apparmor/include/ipc.h | |
| parent | 919fc6e34831d1c2b58bfb5ae261dc3facc9b269 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into core/locking
Merge Linux 3.13-rc4, to refresh this rather old tree with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'security/apparmor/include/ipc.h')
| -rw-r--r-- | security/apparmor/include/ipc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/include/ipc.h b/security/apparmor/include/ipc.h index aeda0fbc8b2f..288ca76e2fb1 100644 --- a/security/apparmor/include/ipc.h +++ b/security/apparmor/include/ipc.h | |||
| @@ -19,8 +19,8 @@ | |||
| 19 | 19 | ||
| 20 | struct aa_profile; | 20 | struct aa_profile; |
| 21 | 21 | ||
| 22 | int aa_may_ptrace(struct task_struct *tracer_task, struct aa_profile *tracer, | 22 | int aa_may_ptrace(struct aa_profile *tracer, struct aa_profile *tracee, |
| 23 | struct aa_profile *tracee, unsigned int mode); | 23 | unsigned int mode); |
| 24 | 24 | ||
| 25 | int aa_ptrace(struct task_struct *tracer, struct task_struct *tracee, | 25 | int aa_ptrace(struct task_struct *tracer, struct task_struct *tracee, |
| 26 | unsigned int mode); | 26 | unsigned int mode); |