diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-08-15 15:59:12 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-08-15 15:59:12 -0400 |
| commit | 1974704eadb221f0e827e05989fe569ec7049a71 (patch) | |
| tree | b2798318a8ff656bfb21de8038add0e24783a19d /drivers/pci/controller/pci-hyperv.c | |
| parent | 0c38011aba35b2cdca263c0ba4d28e2e727b5acb (diff) | |
| parent | 7403bd14d7b545ef89c3443c09ccdb3c631a9a27 (diff) | |
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()
Diffstat (limited to 'drivers/pci/controller/pci-hyperv.c')
| -rw-r--r-- | drivers/pci/controller/pci-hyperv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c index f6325f1a89e8..eb202966b083 100644 --- a/drivers/pci/controller/pci-hyperv.c +++ b/drivers/pci/controller/pci-hyperv.c | |||
| @@ -1545,7 +1545,7 @@ static struct hv_pci_dev *new_pcichild_device(struct hv_pcibus_device *hbus, | |||
| 1545 | unsigned long flags; | 1545 | unsigned long flags; |
| 1546 | int ret; | 1546 | int ret; |
| 1547 | 1547 | ||
| 1548 | hpdev = kzalloc(sizeof(*hpdev), GFP_ATOMIC); | 1548 | hpdev = kzalloc(sizeof(*hpdev), GFP_KERNEL); |
| 1549 | if (!hpdev) | 1549 | if (!hpdev) |
| 1550 | return NULL; | 1550 | return NULL; |
| 1551 | 1551 | ||