diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-05 21:15:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-05 21:15:12 +0100 |
| commit | 925cbd7ed4b073a2afc9915e241ab789b44a3f61 (patch) | |
| tree | 202bb92fcc469a67ac79d54d05bd441a86358c86 /drivers/xen | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert... (diff) | |
| parent | xen/pvcalls: use GFP_ATOMIC under spin lock (diff) | |
| download | linux-925cbd7ed4b073a2afc9915e241ab789b44a3f61.tar.xz linux-925cbd7ed4b073a2afc9915e241ab789b44a3f61.zip | |
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
Diffstat (limited to 'drivers/xen')
| -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); |