diff --git a/[refs] b/[refs] index fe341ac00328..3cf05fdefce1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbab22c1f177e4b0e6f6ce4913cb24118f2b8440 +refs/heads/master: 1d9219ddb9a74ae80aa8d4f0492158224406c3fd diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 5cbf8c64e0f3..8b0f47a71964 100644 --- a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -2142,7 +2142,7 @@ void qlcnic_alloc_lb_filters_mem(struct qlcnic_adapter *adapter) } head = kcalloc(adapter->fhash.fbucket_size, - sizeof(struct hlist_head), GFP_KERNEL); + sizeof(struct hlist_head), GFP_ATOMIC); if (!head) return;