Merge branch 'remotes/lorenzo/pci/hv'

  - Remove unnecessary GFP_ATOMIC from Hyper-V "new child" allocation
    (Jia-Ju Bai)

* remotes/lorenzo/pci/hv:
  PCI: hv: Replace GFP_ATOMIC with GFP_KERNEL in new_pcichild_device()

parents 0c38011a 7403bd14

drivers/pci/controller/pci-hyperv.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1545,7 +1545,7 @@ static struct hv_pci_dev new_pcichild_device(struct hv_pcibus_device hbus,
		unsigned long flags;
		int ret;

		hpdev = kzalloc(sizeof(*hpdev), GFP_ATOMIC);
		hpdev = kzalloc(sizeof(*hpdev), GFP_KERNEL);
		if (!hpdev)
		return NULL;