Commit 02a0947a authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/dead-code' into next 

* pci/dead-code:
  PCI: Remove unused SR-IOV VF Migration support
  iommu/amd: Add include of <linux/irqreturn.h>
  mei: Add include of <linux/irqreturn.h>
  misc: mic: Add include of <linux/irqreturn.h>
parents 9d68c783 46cb7b1b

Documentation/PCI/pci-iov-howto.txt

+0 −4
Original line number Diff line number Diff line
@@ -68,10 +68,6 @@ To disable SR-IOV capability: 
	echo  0 > \

        /sys/bus/pci/devices/<DOMAIN:BUS:DEVICE.FUNCTION>/sriov_numvfs



To notify SR-IOV core of Virtual Function Migration:

(a) In the driver:

	irqreturn_t pci_sriov_migration(struct pci_dev *dev);



3.2 Usage example



Following piece of code illustrates the usage of the SR-IOV API.

drivers/iommu/amd_iommu_types.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/list.h>

#include <linux/spinlock.h>

#include <linux/pci.h>

#include <linux/irqreturn.h>



/*

 * Maximum number of IOMMUs supported

drivers/misc/mei/hw-me.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#define _MEI_INTERFACE_H_



#include <linux/mei.h>

#include <linux/irqreturn.h>

#include "mei_dev.h"

#include "client.h"

drivers/misc/mic/card/mic_device.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#include <linux/workqueue.h>

#include <linux/io.h>

#include <linux/irqreturn.h>



/**

 * struct mic_intr_info - Contains h/w specific interrupt sources info

drivers/misc/mic/host/mic_device.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/cdev.h>

#include <linux/idr.h>

#include <linux/notifier.h>

#include <linux/irqreturn.h>



#include "mic_intr.h"