diff options
| author | James Morris <james.morris@microsoft.com> | 2019-01-22 23:33:10 +0100 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-01-22 23:33:10 +0100 |
| commit | 9624d5c9c7ff6836bbf9f9b230fd1fcf3d56f91a (patch) | |
| tree | e9c1e5d2400ad20c5a9cd633b52a42a00d1d98cb /drivers/net/fddi/defxx.c | |
| parent | LSM: Make some functions static (diff) | |
| parent | Linux 5.0-rc3 (diff) | |
| download | linux-9624d5c9c7ff6836bbf9f9b230fd1fcf3d56f91a.tar.xz linux-9624d5c9c7ff6836bbf9f9b230fd1fcf3d56f91a.zip | |
Merge tag 'v5.0-rc3' into next-general
Sync to Linux 5.0-rc3 to pull in the VFS changes which impacted a lot
of the LSM code.
Diffstat (limited to 'drivers/net/fddi/defxx.c')
| -rw-r--r-- | drivers/net/fddi/defxx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c index 61fceee73c1b..38ac8ef41f5f 100644 --- a/drivers/net/fddi/defxx.c +++ b/drivers/net/fddi/defxx.c @@ -1139,9 +1139,9 @@ static int dfx_driver_init(struct net_device *dev, const char *print_name, #endif sizeof(PI_CONSUMER_BLOCK) + (PI_ALIGN_K_DESC_BLK - 1); - bp->kmalloced = top_v = dma_zalloc_coherent(bp->bus_dev, alloc_size, - &bp->kmalloced_dma, - GFP_ATOMIC); + bp->kmalloced = top_v = dma_alloc_coherent(bp->bus_dev, alloc_size, + &bp->kmalloced_dma, + GFP_ATOMIC); if (top_v == NULL) return DFX_K_FAILURE; |