diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-23 12:20:30 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-23 12:20:30 +1000 |
| commit | cf0c38ff5a60fb1fe6fa813baaa14cdf4a48445e (patch) | |
| tree | 5946dc6779caf02b5b8c17ccd0ba91296f9b2c2e /include/asm-generic | |
| parent | 9371194a55be8081ac8fea6ccecaf62e7456855a (diff) | |
| parent | 66dde9dbae61e9e83f37f01868014a2b9732053c (diff) | |
Merge remote-tracking branch 'audit/master'
Conflicts:
arch/mips/include/asm/syscall.h
arch/mips/kernel/ptrace.c
arch/x86/Kconfig
kernel/audit.c
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/syscall.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/syscall.h b/include/asm-generic/syscall.h index d401e5463fb0..0c938a4354f6 100644 --- a/include/asm-generic/syscall.h +++ b/include/asm-generic/syscall.h @@ -147,7 +147,7 @@ void syscall_set_arguments(struct task_struct *task, struct pt_regs *regs, * * Returns the AUDIT_ARCH_* based on the system call convention in use. * - * It's only valid to call this when @task is stopped on entry to a system + * It's only valid to call this when current is stopped on entry to a system * call, due to %TIF_SYSCALL_TRACE, %TIF_SYSCALL_AUDIT, or %TIF_SECCOMP. * * Architectures which permit CONFIG_HAVE_ARCH_SECCOMP_FILTER must |