From: Greg Kroah-Hartman Date: Fri, 23 Nov 2018 15:01:07 +0000 (+0100) Subject: fix up 4.14 nvme patch to build properly. X-Git-Tag: v3.18.127~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10fb67e80394a599505fcf3351e34202f384c0aa;p=thirdparty%2Fkernel%2Fstable-queue.git fix up 4.14 nvme patch to build properly. --- diff --git a/queue-4.14/nvme-pci-fix-conflicting-p2p-resource-adds.patch b/queue-4.14/nvme-pci-fix-conflicting-p2p-resource-adds.patch index 452df25e601..486e5830e6a 100644 --- a/queue-4.14/nvme-pci-fix-conflicting-p2p-resource-adds.patch +++ b/queue-4.14/nvme-pci-fix-conflicting-p2p-resource-adds.patch @@ -38,24 +38,22 @@ Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- - drivers/nvme/host/pci.c | 5 ++++- + drivers/nvme/host/pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c -index afb99876fa9e..9eb0a2acd41f 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c -@@ -1546,6 +1546,9 @@ static void __iomem *nvme_map_cmb(struct nvme_dev *dev) +@@ -1546,6 +1546,9 @@ static void __iomem *nvme_map_cmb(struct void __iomem *cmb; int bar; + if (dev->cmb_size) -+ return; ++ return NULL; + dev->cmbsz = readl(dev->bar + NVME_REG_CMBSZ); if (!(NVME_CMB_SZ(dev->cmbsz))) return NULL; -@@ -2032,7 +2035,6 @@ static void nvme_pci_disable(struct nvme_dev *dev) +@@ -2032,7 +2035,6 @@ static void nvme_pci_disable(struct nvme { struct pci_dev *pdev = to_pci_dev(dev->dev); @@ -63,7 +61,7 @@ index afb99876fa9e..9eb0a2acd41f 100644 pci_free_irq_vectors(pdev); if (pci_is_enabled(pdev)) { -@@ -2432,6 +2434,7 @@ static void nvme_remove(struct pci_dev *pdev) +@@ -2432,6 +2434,7 @@ static void nvme_remove(struct pci_dev * nvme_stop_ctrl(&dev->ctrl); nvme_remove_namespaces(&dev->ctrl); nvme_dev_disable(dev, true); @@ -71,6 +69,3 @@ index afb99876fa9e..9eb0a2acd41f 100644 nvme_free_host_mem(dev); nvme_dev_remove_admin(dev); nvme_free_queues(dev, 0); --- -2.17.1 -