summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-05 12:15:12 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-05 12:15:12 -0800
commit925cbd7ed4b073a2afc9915e241ab789b44a3f61 (patch)
tree202bb92fcc469a67ac79d54d05bd441a86358c86
parent64648a5fcabf46000a496c41c92c5c0f16be78ed (diff)
parent4aac2caff30fdef1db8403af81e79807811d22ea (diff)
downloadlinux-925cbd7ed4b073a2afc9915e241ab789b44a3f61.tar.bz2
Merge tag 'for-linus-4.15-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fix from Juergen Gross: "One minor fix adjusting the kmalloc flags in the new pvcalls driver added in rc1" * tag 'for-linus-4.15-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen/pvcalls: use GFP_ATOMIC under spin lock
-rw-r--r--drivers/xen/pvcalls-front.c2
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);