diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-09 10:37:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-09 10:37:00 -0500 |
| commit | a0ce093180f2bbb832b3f5583adc640ad67ea568 (patch) | |
| tree | 62c9aca5be3566ea4810e4584a02870de8b953f8 /drivers/xen/pvcalls-front.c | |
| parent | f4803f1b73f877a571be4c8e531dfcf190acc691 (diff) | |
| parent | ef7f8cec80a0ba7bd00ece46844c8994117dc910 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/xen/pvcalls-front.c')
| -rw-r--r-- | drivers/xen/pvcalls-front.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/pvcalls-front.c b/drivers/xen/pvcalls-front.c index d1e1d8d2b9d5..4c789e61554b 100644 --- a/drivers/xen/pvcalls-front.c +++ b/drivers/xen/pvcalls-front.c @@ -805,7 +805,7 @@ int pvcalls_front_accept(struct socket *sock, struct socket *newsock, int flags) pvcalls_exit(); return ret; } - map2 = kzalloc(sizeof(*map2), GFP_KERNEL); + map2 = kzalloc(sizeof(*map2), GFP_ATOMIC); if (map2 == NULL) { clear_bit(PVCALLS_FLAG_ACCEPT_INFLIGHT, (void *)&map->passive.flags); |