diff --git a/[refs] b/[refs] index 6d3e3bc24dc3..7a98bafcd396 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4bd8c66435a8cdf8c90334fb3b517a23ff2ab95 +refs/heads/master: 645408d1ffe9f27b176a88302c22420f301607db diff --git a/trunk/include/net/netlabel.h b/trunk/include/net/netlabel.h index 113337c27955..12c214b9eadf 100644 --- a/trunk/include/net/netlabel.h +++ b/trunk/include/net/netlabel.h @@ -136,7 +136,7 @@ struct netlbl_lsm_secattr { * on success, NULL on failure. * */ -static inline struct netlbl_lsm_cache *netlbl_secattr_cache_alloc(int flags) +static inline struct netlbl_lsm_cache *netlbl_secattr_cache_alloc(gfp_t flags) { struct netlbl_lsm_cache *cache;