diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-20 20:09:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-20 20:09:44 -0800 |
| commit | cf70a6f264f6e1a4c06553699159d94996b2f916 (patch) | |
| tree | 7a5993585e7e8b80c37cae75468fca45da6519d2 /kernel | |
| parent | 0b1fc9b86f49e1e73e473e06a16556ca0dce53ae (diff) | |
| parent | ad6b97fc929e5844bfd1d708ab1d74d131d7960d (diff) | |
| download | linux-cf70a6f264f6e1a4c06553699159d94996b2f916.tar.gz linux-cf70a6f264f6e1a4c06553699159d94996b2f916.tar.bz2 linux-cf70a6f264f6e1a4c06553699159d94996b2f916.zip | |
Merge branch 'fixes.b8' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/auditsc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 685c25175d96..d7e7e637b92a 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -841,7 +841,7 @@ static void audit_log_exit(struct audit_context *context, gfp_t gfp_mask) for (aux = context->aux; aux; aux = aux->next) { - ab = audit_log_start(context, GFP_KERNEL, aux->type); + ab = audit_log_start(context, gfp_mask, aux->type); if (!ab) continue; /* audit_panic has been called */ @@ -878,14 +878,14 @@ static void audit_log_exit(struct audit_context *context, gfp_t gfp_mask) } if (context->pwd && context->pwdmnt) { - ab = audit_log_start(context, GFP_KERNEL, AUDIT_CWD); + ab = audit_log_start(context, gfp_mask, AUDIT_CWD); if (ab) { audit_log_d_path(ab, "cwd=", context->pwd, context->pwdmnt); audit_log_end(ab); } } for (i = 0; i < context->name_count; i++) { - ab = audit_log_start(context, GFP_KERNEL, AUDIT_PATH); + ab = audit_log_start(context, gfp_mask, AUDIT_PATH); if (!ab) continue; /* audit_panic has been called */ |