diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-03-03 14:18:08 -0500 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-03-03 14:18:08 -0500 |
| commit | 27710bf6febe8323f78bceca002ca7d71e5012a7 (patch) | |
| tree | 80a72f385ea28f9f7649363fe5147b3da37f9950 /kernel/auditsc.c | |
| parent | 9ef64cb4320df821638b508f79aa8b858cca99f0 (diff) | |
| parent | cad226b8a71f969ad05137e43b48c9e6059a0b9f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/auditsc.c')
| -rw-r--r-- | kernel/auditsc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 2087d6de67ea..782262e4107d 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
| @@ -1070,7 +1070,7 @@ static int audit_log_single_execve_arg(struct audit_context *context, | |||
| 1070 | * so we can be sure nothing was lost. | 1070 | * so we can be sure nothing was lost. |
| 1071 | */ | 1071 | */ |
| 1072 | if ((i == 0) && (too_long)) | 1072 | if ((i == 0) && (too_long)) |
| 1073 | audit_log_format(*ab, "a%d_len=%ld ", arg_num, | 1073 | audit_log_format(*ab, "a%d_len=%zu ", arg_num, |
| 1074 | has_cntl ? 2*len : len); | 1074 | has_cntl ? 2*len : len); |
| 1075 | 1075 | ||
| 1076 | /* | 1076 | /* |