Merge branch 'for-linus-3.4' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf

[~andy/linux] / net / netlabel / netlabel_kapi.c

diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
index 2560e7b441c60a2b7a8c76aa6de3c4d62bd92035..7c94aedd0912777d6d0956f0f5b048f0f62ab97d 100644 (file)
--- a/net/netlabel/netlabel_kapi.c
+++ b/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;