diff --git a/[refs] b/[refs] index 5a54e3463b0a..ef3fcd1e0812 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ac52f33b6f05fcb91a97124155183b779a4efdf +refs/heads/master: 4332bdd332a2dca93dc3b1d017b2dd27d5c8cef3 diff --git a/trunk/kernel/audit.c b/trunk/kernel/audit.c index 993e445418a7..b86007da8a3f 100644 --- a/trunk/kernel/audit.c +++ b/trunk/kernel/audit.c @@ -611,13 +611,13 @@ static struct audit_buffer * audit_buffer_alloc(struct audit_context *ctx, spin_unlock_irqrestore(&audit_freelist_lock, flags); if (!ab) { - ab = kmalloc(sizeof(*ab), GFP_ATOMIC); + ab = kmalloc(sizeof(*ab), gfp_mask); if (!ab) goto err; } atomic_inc(&audit_backlog); - ab->skb = alloc_skb(AUDIT_BUFSIZ, GFP_ATOMIC); + ab->skb = alloc_skb(AUDIT_BUFSIZ, gfp_mask); if (!ab->skb) goto err;