2.6.16-rc1-git6 refresh

5 files changed, 17 insertions, 17 deletions

diff --git a/pci/altix-msi-support.patch b/pci/altix-msi-support.patch
index 51848e6327313..f9c37267700a9 100644
--- a/pci/altix-msi-support.patch
+++ b/pci/altix-msi-support.patch
@@ -239,7 +239,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
 --- gregkh-2.6.orig/arch/ia64/sn/kernel/io_init.c
 +++ gregkh-2.6/arch/ia64/sn/kernel/io_init.c
-@@ -51,7 +51,7 @@ static int max_pcibus_number = 255; /* D
+@@ -52,7 +52,7 @@ static int max_pcibus_number = 255; /* D
   */
  
  static dma_addr_t
diff --git a/pci/msi-vector-targeting-abstractions.patch b/pci/msi-vector-targeting-abstractions.patch
index 1b7cc16048e88..e500c7a3917fb 100644
--- a/pci/msi-vector-targeting-abstractions.patch
+++ b/pci/msi-vector-targeting-abstractions.patch
@@ -166,7 +166,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	if ((status = msi_cache_init()) < 0) {
  		pci_msi_enable = 0;
  		printk(KERN_WARNING "PCI: MSI cache init failed\n");
-@@ -512,9 +516,11 @@ void pci_scan_msi_device(struct pci_dev 
+@@ -514,9 +518,11 @@ void pci_scan_msi_device(struct pci_dev 
   **/
  static int msi_capability_init(struct pci_dev *dev)
  {
@@ -180,7 +180,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	int pos, vector;
  	u16 control;
  
-@@ -541,23 +547,27 @@ static int msi_capability_init(struct pc
+@@ -543,23 +549,27 @@ static int msi_capability_init(struct pc
  		entry->mask_base = (void __iomem *)(long)msi_mask_bits_reg(pos,
  				is_64bit_address(control));
  	}
@@ -220,7 +220,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	if (entry->msi_attrib.maskbit) {
  		unsigned int maskbits, temp;
  		/* All MSIs are unmasked by default, Mask them all */
-@@ -592,13 +602,15 @@ static int msix_capability_init(struct p
+@@ -594,13 +604,15 @@ static int msix_capability_init(struct p
  				struct msix_entry *entries, int nvec)
  {
  	struct msi_desc *head = NULL, *tail = NULL, *entry = NULL;
@@ -238,7 +238,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
     	pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
  	/* Request & Map MSI-X table region */
-@@ -645,18 +657,20 @@ static int msix_capability_init(struct p
+@@ -647,18 +659,20 @@ static int msix_capability_init(struct p
  		/* Replace with MSI-X handler */
  		irq_handler_init(PCI_CAP_ID_MSIX, vector, 1);
  		/* Configure MSI-X capability structure */
@@ -267,7 +267,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			base + j * PCI_MSIX_ENTRY_SIZE +
  			PCI_MSIX_ENTRY_DATA_OFFSET);
  		attach_msi_entry(entry, vector);
-@@ -791,6 +805,8 @@ static int msi_free_vector(struct pci_de
+@@ -793,6 +807,8 @@ static int msi_free_vector(struct pci_de
  	void __iomem *base;
  	unsigned long flags;
  
diff --git a/pci/pci-clean-up-msi.c-a-bit.patch b/pci/pci-clean-up-msi.c-a-bit.patch
index 9b4e0256cf9d6..34c2a4e3af7b7 100644
--- a/pci/pci-clean-up-msi.c-a-bit.patch
+++ b/pci/pci-clean-up-msi.c-a-bit.patch
@@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		pci_msi_enable = 0;
  		printk(KERN_WARNING "PCI: MSI cache init failed\n");
  		return status;
-@@ -532,10 +534,12 @@ static int msi_capability_init(struct pc
+@@ -534,10 +536,12 @@ static int msi_capability_init(struct pc
     	pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
  	pci_read_config_word(dev, msi_control_reg(pos), &control);
  	/* MSI Entry Initialization */
@@ -86,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		kmem_cache_free(msi_cachep, entry);
  		return -EBUSY;
  	}
-@@ -635,7 +639,8 @@ static int msix_capability_init(struct p
+@@ -637,7 +641,8 @@ static int msix_capability_init(struct p
  		entry = alloc_msi_entry();
  		if (!entry)
  			break;
@@ -96,7 +96,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			break;
  
   		j = entries[i].entry;
-@@ -718,10 +723,12 @@ int pci_enable_msi(struct pci_dev* dev)
+@@ -720,10 +725,12 @@ int pci_enable_msi(struct pci_dev* dev)
  
  	temp = dev->irq;
  
@@ -111,7 +111,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		return -EINVAL;
  
  	pci_read_config_word(dev, msi_control_reg(pos), &control);
-@@ -745,8 +752,8 @@ int pci_enable_msi(struct pci_dev* dev)
+@@ -747,8 +754,8 @@ int pci_enable_msi(struct pci_dev* dev)
  		dev->irq = temp;
  	}
  	/* Check whether driver already requested for MSI-X vectors */
@@ -122,7 +122,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			printk(KERN_INFO "PCI: %s: Can't enable MSI.  "
  			       "Device already has MSI-X vectors assigned\n",
  			       pci_name(dev));
-@@ -772,7 +779,10 @@ void pci_disable_msi(struct pci_dev* dev
+@@ -774,7 +781,10 @@ void pci_disable_msi(struct pci_dev* dev
  	u16 control;
  	unsigned long flags;
  
@@ -134,7 +134,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		return;
  
  	pci_read_config_word(dev, msi_control_reg(pos), &control);
-@@ -943,10 +953,12 @@ int pci_enable_msix(struct pci_dev* dev,
+@@ -945,10 +955,12 @@ int pci_enable_msix(struct pci_dev* dev,
  	if (!pci_msi_enable || !dev || !entries)
   		return -EINVAL;
  
@@ -149,7 +149,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
   		return -EINVAL;
  
  	pci_read_config_word(dev, msi_control_reg(pos), &control);
-@@ -1025,7 +1037,11 @@ void pci_disable_msix(struct pci_dev* de
+@@ -1027,7 +1039,11 @@ void pci_disable_msix(struct pci_dev* de
  	int pos, temp;
  	u16 control;
  
@@ -162,7 +162,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		return;
  
  	pci_read_config_word(dev, msi_control_reg(pos), &control);
-@@ -1085,8 +1101,8 @@ void msi_remove_pci_irq_vectors(struct p
+@@ -1087,8 +1103,8 @@ void msi_remove_pci_irq_vectors(struct p
   		return;
  
  	temp = dev->irq;		/* Save IOAPIC IRQ */
@@ -173,7 +173,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		spin_lock_irqsave(&msi_lock, flags);
  		state = msi_desc[dev->irq]->msi_attrib.state;
  		spin_unlock_irqrestore(&msi_lock, flags);
-@@ -1099,8 +1115,8 @@ void msi_remove_pci_irq_vectors(struct p
+@@ -1101,8 +1117,8 @@ void msi_remove_pci_irq_vectors(struct p
  			msi_free_vector(dev, dev->irq, 0);
  		dev->irq = temp;		/* Restore IOAPIC IRQ */
  	}
diff --git a/pci/pci-schedule-pci_legacy_proc-for-removal.patch b/pci/pci-schedule-pci_legacy_proc-for-removal.patch
index 52dfb87c7d047..5c4fec72ca423 100644
--- a/pci/pci-schedule-pci_legacy_proc-for-removal.patch
+++ b/pci/pci-schedule-pci_legacy_proc-for-removal.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/Documentation/feature-removal-schedule.txt
 +++ gregkh-2.6/Documentation/feature-removal-schedule.txt
-@@ -157,3 +157,10 @@ Why:	The ISA interface is faster and sho
+@@ -171,3 +171,10 @@ Why:	The ISA interface is faster and sho
  	probing is also known to cause trouble in at least one case (see
  	bug #5889.)
  Who:	Jean Delvare <khali@linux-fr.org>
diff --git a/pci/pci-schedule-removal-of-pci_module_init.patch b/pci/pci-schedule-removal-of-pci_module_init.patch
index 9a8ac9e4214b9..d911c57aa4092 100644
--- a/pci/pci-schedule-removal-of-pci_module_init.patch
+++ b/pci/pci-schedule-removal-of-pci_module_init.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/Documentation/feature-removal-schedule.txt
 +++ gregkh-2.6/Documentation/feature-removal-schedule.txt
-@@ -164,3 +164,10 @@ What:	Legacy /proc/pci interface (PCI_LE
+@@ -178,3 +178,10 @@ What:	Legacy /proc/pci interface (PCI_LE
  When:	March 2006
  Why:	deprecated since 2.5.53 in favor of lspci(8)
  Who:	Adrian Bunk <bunk@stusta.de>