diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-20 08:36:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-20 08:36:04 -0700 |
| commit | 36e584de256a8155a292a96288bd78a3a328aa4f (patch) | |
| tree | d418c18e374e99717adc492a06c40c3bf0c028a4 /drivers/xen/xen-pciback/conf_space_quirks.c | |
| parent | 854da238752775ba399890f54d4ef75f57c6aae8 (diff) | |
| parent | ebf04f331fa15a966262341a7dc6b1a0efd633e4 (diff) | |
| download | talos-obmc-linux-36e584de256a8155a292a96288bd78a3a328aa4f.tar.gz talos-obmc-linux-36e584de256a8155a292a96288bd78a3a328aa4f.zip | |
Merge tag 'for-linus-4.17-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
- some fixes of kmalloc() flags
- one fix of the xenbus driver
- an update of the pv sound driver interface needed for a driver which
will go through the sound tree
* tag 'for-linus-4.17-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen: xenbus_dev_frontend: Really return response string
xen/sndif: Sync up with the canonical definition in Xen
xen: xen-pciback: Replace GFP_ATOMIC with GFP_KERNEL in pcistub_reg_add
xen: xen-pciback: Replace GFP_ATOMIC with GFP_KERNEL in xen_pcibk_config_quirks_init
xen: xen-pciback: Replace GFP_ATOMIC with GFP_KERNEL in pcistub_device_alloc
xen: xen-pciback: Replace GFP_ATOMIC with GFP_KERNEL in pcistub_init_device
xen: xen-pciback: Replace GFP_ATOMIC with GFP_KERNEL in pcistub_probe
Diffstat (limited to 'drivers/xen/xen-pciback/conf_space_quirks.c')
| -rw-r--r-- | drivers/xen/xen-pciback/conf_space_quirks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/xen-pciback/conf_space_quirks.c b/drivers/xen/xen-pciback/conf_space_quirks.c index 89d9744ece61..ed593d1042a6 100644 --- a/drivers/xen/xen-pciback/conf_space_quirks.c +++ b/drivers/xen/xen-pciback/conf_space_quirks.c @@ -95,7 +95,7 @@ int xen_pcibk_config_quirks_init(struct pci_dev *dev) struct xen_pcibk_config_quirk *quirk; int ret = 0; - quirk = kzalloc(sizeof(*quirk), GFP_ATOMIC); + quirk = kzalloc(sizeof(*quirk), GFP_KERNEL); if (!quirk) { ret = -ENOMEM; goto out; |
