diff options
| author | David S. Miller <davem@davemloft.net> | 2016-03-20 04:05:24 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-20 04:05:24 +0300 |
| commit | c78a85a8430e35aecd53e190a2f6b999062b1037 (patch) | |
| tree | fbd69827579db437492fb77b5faa53814114bed3 /drivers/net/ethernet/qlogic/qed/qed_hw.c | |
| parent | 133800d1f0288b9ddfc0d0aded10d9efa82d5b8c (diff) | |
| parent | de06dbfa7861c9019eedefc0c356ba86e5098f1b (diff) | |
| download | linux-c78a85a8430e35aecd53e190a2f6b999062b1037.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Diffstat (limited to 'drivers/net/ethernet/qlogic/qed/qed_hw.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qed/qed_hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qed/qed_hw.c b/drivers/net/ethernet/qlogic/qed/qed_hw.c index ffa99273b353..a95a3e4b3101 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_hw.c +++ b/drivers/net/ethernet/qlogic/qed/qed_hw.c @@ -44,7 +44,7 @@ struct qed_ptt_pool { int qed_ptt_pool_alloc(struct qed_hwfn *p_hwfn) { struct qed_ptt_pool *p_pool = kmalloc(sizeof(*p_pool), - GFP_ATOMIC); + GFP_KERNEL); int i; if (!p_pool) |