refresh for 2.6.16-git6

3 files changed, 14 insertions, 14 deletions

diff --git a/pci/pci-fix-pci_request_region-arg.patch b/pci/pci-fix-pci_request_region-arg.patch
index 3c477275c341d..68cdd1f805a0d 100644
--- a/pci/pci-fix-pci_request_region-arg.patch
+++ b/pci/pci-fix-pci_request_region-arg.patch
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/pci/pci.c
 +++ gregkh-2.6/drivers/pci/pci.c
-@@ -648,7 +648,7 @@ void pci_release_region(struct pci_dev *
+@@ -639,7 +639,7 @@ void pci_release_region(struct pci_dev *
   *	Returns 0 on success, or %EBUSY on error.  A warning
   *	message is also printed on failure.
   */
@@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  {
  	if (pci_resource_len(pdev, bar) == 0)
  		return 0;
-@@ -706,7 +706,7 @@ void pci_release_regions(struct pci_dev 
+@@ -697,7 +697,7 @@ void pci_release_regions(struct pci_dev 
   *	Returns 0 on success, or %EBUSY on error.  A warning
   *	message is also printed on failure.
   */
@@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	
 --- gregkh-2.6.orig/include/linux/pci.h
 +++ gregkh-2.6/include/linux/pci.h
-@@ -521,9 +521,9 @@ void pdev_sort_resources(struct pci_dev 
+@@ -490,9 +490,9 @@ void pdev_sort_resources(struct pci_dev 
  void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *),
  		    int (*)(struct pci_dev *, u8, u8));
  #define HAVE_PCI_REQ_REGIONS	2
diff --git a/pci/pci-fix-problems-with-msi-x-on-ia64.patch b/pci/pci-fix-problems-with-msi-x-on-ia64.patch
index e6676ec178a00..be800511c194b 100644
--- a/pci/pci-fix-problems-with-msi-x-on-ia64.patch
+++ b/pci/pci-fix-problems-with-msi-x-on-ia64.patch
@@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/pci/msi.c
 +++ gregkh-2.6/drivers/pci/msi.c
-@@ -784,7 +784,8 @@ static int msix_capability_init(struct p
+@@ -600,7 +600,8 @@ static int msix_capability_init(struct p
  	struct msg_address address;
  	struct msg_data data;
  	int vector, pos, i, j, nr_entries, temp = 0;
@@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
   	u16 control;
  	u8 bir;
  	void __iomem *base;
-@@ -793,11 +794,11 @@ static int msix_capability_init(struct p
+@@ -609,11 +610,11 @@ static int msix_capability_init(struct p
  	/* Request & Map MSI-X table region */
   	pci_read_config_word(dev, msi_control_reg(pos), &control);
  	nr_entries = multi_msix_capable(control);
@@ -58,7 +58,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	base = ioremap_nocache(phys_addr, nr_entries * PCI_MSIX_ENTRY_SIZE);
  	if (base == NULL)
  		return -ENOMEM;
-@@ -1033,8 +1034,10 @@ static int msi_free_vector(struct pci_de
+@@ -838,8 +839,10 @@ static int msi_free_vector(struct pci_de
  			 * Detect last MSI-X vector to be released.
  			 * Release the MSI-X memory-mapped table.
  			 */
@@ -70,7 +70,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			u16 control;
  			u8 bir;
  
-@@ -1045,9 +1048,12 @@ static int msi_free_vector(struct pci_de
+@@ -850,9 +853,12 @@ static int msi_free_vector(struct pci_de
  			pci_read_config_dword(dev, msix_table_offset_reg(pos),
  				&table_offset);
  			bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK);
@@ -86,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			iounmap(base);
  		}
  	}
-@@ -1314,7 +1320,9 @@ void msi_remove_pci_irq_vectors(struct p
+@@ -1119,7 +1125,9 @@ void msi_remove_pci_irq_vectors(struct p
  		msi_free_vector(dev, vector, 0);
  		if (warning) {
  			/* Force to release the MSI-X memory-mapped table */
@@ -97,7 +97,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			u16 control;
  			u8 bir;
  
-@@ -1323,9 +1331,12 @@ void msi_remove_pci_irq_vectors(struct p
+@@ -1128,9 +1136,12 @@ void msi_remove_pci_irq_vectors(struct p
  			pci_read_config_dword(dev, msix_table_offset_reg(pos),
  				&table_offset);
  			bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK);
diff --git a/pci/pci-provide-a-boot-parameter-to-disable-msi.patch b/pci/pci-provide-a-boot-parameter-to-disable-msi.patch
index 5a3277940c9c0..9197b27313363 100644
--- a/pci/pci-provide-a-boot-parameter-to-disable-msi.patch
+++ b/pci/pci-provide-a-boot-parameter-to-disable-msi.patch
@@ -60,7 +60,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  config PCI_DEBUG
 --- gregkh-2.6.orig/drivers/pci/msi.c
 +++ gregkh-2.6/drivers/pci/msi.c
-@@ -960,8 +960,11 @@ void pci_disable_msi(struct pci_dev* dev
+@@ -765,8 +765,11 @@ void pci_disable_msi(struct pci_dev* dev
  	u16 control;
  	unsigned long flags;
  
@@ -72,7 +72,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
  	if (!pos)
  		return;
-@@ -1221,6 +1224,8 @@ void pci_disable_msix(struct pci_dev* de
+@@ -1026,6 +1029,8 @@ void pci_disable_msix(struct pci_dev* de
  	int pos, temp;
  	u16 control;
  
@@ -81,7 +81,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	if (!dev)
  		return;
  
-@@ -1347,6 +1352,11 @@ void msi_remove_pci_irq_vectors(struct p
+@@ -1152,6 +1157,11 @@ void msi_remove_pci_irq_vectors(struct p
  	}
  }
  
@@ -95,7 +95,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  EXPORT_SYMBOL(pci_enable_msix);
 --- gregkh-2.6.orig/drivers/pci/pci.c
 +++ gregkh-2.6/drivers/pci/pci.c
-@@ -909,8 +909,12 @@ static int __devinit pci_setup(char *str
+@@ -900,8 +900,12 @@ static int __devinit pci_setup(char *str
  		if (k)
  			*k++ = 0;
  		if (*str && (str = pcibios_setup(str)) && *str) {
@@ -122,4 +122,4 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +static inline void pci_no_msi(void) { }
  #endif
  
- #if defined(CONFIG_PCI_MSI) && defined(CONFIG_PM)
+ extern int pcie_mch_quirk;