diff --git a/[refs] b/[refs] index 0ea7284c7881..496e0b927ca0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 352d48008b6f3e02d8ce77868432e329dd921cb1 +refs/heads/master: 1f758d93548fb3c6297c05a351a4ba532de6a497 diff --git a/trunk/include/net/netlabel.h b/trunk/include/net/netlabel.h index 12c214b9eadf..ba2f6823805c 100644 --- a/trunk/include/net/netlabel.h +++ b/trunk/include/net/netlabel.h @@ -205,7 +205,7 @@ static inline void netlbl_secattr_destroy(struct netlbl_lsm_secattr *secattr) * pointer on success, or NULL on failure. * */ -static inline struct netlbl_lsm_secattr *netlbl_secattr_alloc(int flags) +static inline struct netlbl_lsm_secattr *netlbl_secattr_alloc(gfp_t flags) { return kzalloc(sizeof(struct netlbl_lsm_secattr), flags); }