From 5248320e182705709fdce0ace31d9d15948052c0 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 21 Mar 2012 20:41:01 +0000 Subject: [PATCH] --- yaml --- r: 294675 b: refs/heads/master c: 64b5fad526f63e9b56752a7e8e153b99ec0ddecd h: refs/heads/master i: 294673: 6a0e18e854dc2eeddbc5a3d43067f02b4f7b5646 294671: e461cae1a9d5428898e344fcae25569a14a45a7b v: v3 --- [refs] | 2 +- trunk/net/netlabel/netlabel_kapi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 552b295dea17..1cf9a50a2ef7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9395a09d05a23bb313cd20c99fb234f308d948b3 +refs/heads/master: 64b5fad526f63e9b56752a7e8e153b99ec0ddecd diff --git a/trunk/net/netlabel/netlabel_kapi.c b/trunk/net/netlabel/netlabel_kapi.c index 2560e7b441c6..7c94aedd0912 100644 --- a/trunk/net/netlabel/netlabel_kapi.c +++ b/trunk/net/netlabel/netlabel_kapi.c @@ -597,7 +597,7 @@ int netlbl_secattr_catmap_setrng(struct netlbl_lsm_secattr_catmap *catmap, iter = iter->next; iter_max_spot = iter->startbit + NETLBL_CATMAP_SIZE; } - ret_val = netlbl_secattr_catmap_setbit(iter, spot, GFP_ATOMIC); + ret_val = netlbl_secattr_catmap_setbit(iter, spot, flags); } return ret_val;