diff --git a/[refs] b/[refs] index 6d6646f2217e..fb8b78c29fdf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad3f9a2238e401a1fc493b8c91341f9e57940eda +refs/heads/master: 6c8c8ba5d7e31b37d0184c388183a6039a672417 diff --git a/trunk/kernel/audit.c b/trunk/kernel/audit.c index b683f2b5e866..518a833b676a 100644 --- a/trunk/kernel/audit.c +++ b/trunk/kernel/audit.c @@ -564,7 +564,7 @@ static void audit_buffer_free(struct audit_buffer *ab) } static struct audit_buffer * audit_buffer_alloc(struct audit_context *ctx, - int gfp_mask, int type) + unsigned int __nocast gfp_mask, int type) { unsigned long flags; struct audit_buffer *ab = NULL;