Commit 925cbd7e authored Jan 05, 2018 by Linus Torvalds

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

parents 64648a5f 4aac2caf

drivers/xen/pvcalls-front.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);