Commit b5c55104 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable/xen-pcifront-fixes' of... 

Merge branch 'stable/xen-pcifront-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/xen-pcifront-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  MAINTAINERS: Mark XEN lists as moderated
  xen-pcifront: fix PCI reference leak
  xen-pcifront: Remove duplicate inclusion of headers.
  xen: fix memory leak in Xen PCI MSI/MSI-X allocator.
  MAINTAINERS: Update mailing list name for Xen pieces.
parents a0a6da1a b74831e6

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -6598,14 +6598,14 @@ F: drivers/platform/x86 


XEN PCI SUBSYSTEM

M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

L:	xen-devel@lists.xensource.com

L:	xen-devel@lists.xensource.com (moderated for non-subscribers)

S:	Supported

F:	arch/x86/pci/*xen*

F:	drivers/pci/*xen*



XEN SWIOTLB SUBSYSTEM

M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

L:	xen-devel@lists.xensource.com

L:	xen-devel@lists.xensource.com (moderated for non-subscribers)

S:	Supported

F:	arch/x86/xen/*swiotlb*

F:	drivers/xen/*swiotlb*
@@ -6613,7 +6613,7 @@ F: drivers/xen/*swiotlb* 
XEN HYPERVISOR INTERFACE

M:	Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

L:	xen-devel@lists.xen.org

L:	xen-devel@lists.xensource.com (moderated for non-subscribers)

L:	virtualization@lists.osdl.org

S:	Supported

F:	arch/x86/xen/

arch/x86/pci/xen.c

+5 −3
Original line number Diff line number Diff line
@@ -147,8 +147,10 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 
		irq = xen_allocate_pirq(v[i], 0, /* not sharable */

			(type == PCI_CAP_ID_MSIX) ?

			"pcifront-msi-x" : "pcifront-msi");

		if (irq < 0)

			return -1;

		if (irq < 0) {

			ret = -1;

			goto free;

		}



		ret = set_irq_msi(irq, msidesc);

		if (ret)
@@ -164,7 +166,7 @@ error: 
	if (ret == -ENODEV)

		dev_err(&dev->dev, "Xen PCI frontend has not registered" \

			" MSI/MSI-X support!\n");



free:

	kfree(v);

	return ret;

}

drivers/pci/xen-pcifront.c

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/spinlock.h>

#include <linux/pci.h>

#include <linux/msi.h>

#include <xen/xenbus.h>

#include <xen/interface/io/pciif.h>

#include <asm/xen/pci.h>

#include <linux/interrupt.h>
@@ -576,8 +575,9 @@ static pci_ers_result_t pcifront_common_process(int cmd, 


	pcidev = pci_get_bus_and_slot(bus, devfn);

	if (!pcidev || !pcidev->driver) {

		dev_err(&pcidev->dev,

			"device or driver is NULL\n");

		dev_err(&pdev->xdev->dev, "device or AER driver is NULL\n");

		if (pcidev)

			pci_dev_put(pcidev);

		return result;

	}

	pdrv = pcidev->driver;

CRA Git | Maintained and supported by SUSTech CRA and CCSE