Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / drivers / net / ethernet / pensando / ionic / ionic_rx_filter.c

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_rx_filter.c b/drivers/net/ethernet/pensando/ionic/ionic_rx_filter.c
index 7e3a563..25ecfcf 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_rx_filter.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_rx_filter.c
@@ -318,7 +318,7 @@ void ionic_rx_filter_sync(struct ionic_lif *lif)
                        if (f->state == IONIC_FILTER_STATE_NEW ||
                            f->state == IONIC_FILTER_STATE_OLD) {
                                sync_item = devm_kzalloc(dev, sizeof(*sync_item),
-                                                        GFP_KERNEL);
+                                                        GFP_ATOMIC);
                                if (!sync_item)
                                        goto loop_out;