kernel: update linux 3.7 to 3.7.2

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 35100

7 files changed, 15 insertions, 44 deletions

diff --git a/target/linux/generic/patches-3.7/025-bcma_backport.patch b/target/linux/generic/patches-3.7/025-bcma_backport.patch
index c4f27d1..fa0ff31 100644
--- a/target/linux/generic/patches-3.7/025-bcma_backport.patch
+++ b/target/linux/generic/patches-3.7/025-bcma_backport.patch
@@ -1357,7 +1357,7 @@
  #endif /* LINUX_BCMA_REGS_H_ */
 --- a/drivers/net/wireless/b43/main.c
 +++ b/drivers/net/wireless/b43/main.c
-@@ -4652,7 +4652,7 @@ static int b43_wireless_core_init(struct
+@@ -4656,7 +4656,7 @@ static int b43_wireless_core_init(struct
  	switch (dev->dev->bus_type) {
  #ifdef CONFIG_B43_BCMA
  	case B43_BUS_BCMA:
diff --git a/target/linux/generic/patches-3.7/100-overlayfs.patch b/target/linux/generic/patches-3.7/100-overlayfs.patch
index 1c6fc4c..ea29ddb 100644
--- a/target/linux/generic/patches-3.7/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.7/100-overlayfs.patch
@@ -3102,7 +3102,7 @@
 +module_exit(ovl_exit);
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1308,6 +1308,7 @@ long do_splice_direct(struct file *in, l
+@@ -1310,6 +1310,7 @@ long do_splice_direct(struct file *in, l
  
  	return ret;
  }
diff --git a/target/linux/generic/patches-3.7/131-atm-fixes.patch b/target/linux/generic/patches-3.7/131-atm-fixes.patch
index 4cc3e57..64e50b3 100644
--- a/target/linux/generic/patches-3.7/131-atm-fixes.patch
+++ b/target/linux/generic/patches-3.7/131-atm-fixes.patch
@@ -452,7 +452,7 @@ Date:   Sun Nov 25 12:06:52 2012 +0000
  	return;
  }
  
-@@ -1011,9 +989,12 @@ static uint32_t fpga_tx(struct solos_car
+@@ -1012,9 +990,12 @@ static uint32_t fpga_tx(struct solos_car
  			if (vcc) {
  				atomic_inc(&vcc->stats->tx);
  				solos_pop(vcc, oldskb);
@@ -467,7 +467,7 @@ Date:   Sun Nov 25 12:06:52 2012 +0000
  		}
  	}
  	/* For non-DMA TX, write the 'TX start' bit for all four ports simultaneously */
-@@ -1248,7 +1229,7 @@ static int atm_init(struct solos_card *c
+@@ -1249,7 +1230,7 @@ static int atm_init(struct solos_card *c
  		card->atmdev[i]->phy_data = (void *)(unsigned long)i;
  		atm_dev_signal_change(card->atmdev[i], ATM_PHY_SIG_FOUND);
  
@@ -476,7 +476,7 @@ Date:   Sun Nov 25 12:06:52 2012 +0000
  		if (!skb) {
  			dev_warn(&card->dev->dev, "Failed to allocate sk_buff in atm_init()\n");
  			continue;
-@@ -1345,6 +1326,8 @@ static struct pci_driver fpga_driver = {
+@@ -1346,6 +1327,8 @@ static struct pci_driver fpga_driver = {
  
  static int __init solos_pci_init(void)
  {
diff --git a/target/linux/generic/patches-3.7/132-solos-dma.patch b/target/linux/generic/patches-3.7/132-solos-dma.patch
index c95ecbe..0b761ea 100644
--- a/target/linux/generic/patches-3.7/132-solos-dma.patch
+++ b/target/linux/generic/patches-3.7/132-solos-dma.patch
@@ -44,21 +44,6 @@ Date:   Wed Dec 19 11:01:18 2012 +0000
     Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
     Signed-off-by: David S. Miller <davem@davemloft.net>
 
-commit cae49ede00ec3d0cda290b03fee55b72b49efc11
-Author: David Woodhouse <dwmw2@infradead.org>
-Date:   Tue Dec 11 14:57:14 2012 +0000
-
-    solos-pci: fix double-free of TX skb in DMA mode
-    
-    We weren't clearing card->tx_skb[port] when processing the TX done interrupt.
-    If there wasn't another skb ready to transmit immediately, this led to a
-    double-free because we'd free it *again* next time we did have a packet to
-    send.
-    
-    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-    Cc: stable@kernel.org
-    Signed-off-by: David S. Miller <davem@davemloft.net>
-
 ==
 There is a typo here so we do a double lock instead of an unlock.
 
@@ -314,21 +299,7 @@ solos-pci: add GPIO support for newer versions on Geos board
  			if(card->fpga_version > LEGACY_BUFFERS)
  				iowrite32(word, FLASH_BUF + i);
  			else
-@@ -945,10 +1069,11 @@ static uint32_t fpga_tx(struct solos_car
- 	for (port = 0; tx_pending; tx_pending >>= 1, port++) {
- 		if (tx_pending & 1) {
- 			struct sk_buff *oldskb = card->tx_skb[port];
--			if (oldskb)
-+			if (oldskb) {
- 				pci_unmap_single(card->dev, SKB_CB(oldskb)->dma_addr,
- 						 oldskb->len, PCI_DMA_TODEVICE);
--
-+				card->tx_skb[port] = NULL;
-+			}
- 			spin_lock(&card->tx_queue_lock);
- 			skb = skb_dequeue(&card->tx_queue[port]);
- 			if (!skb)
-@@ -960,7 +1085,12 @@ static uint32_t fpga_tx(struct solos_car
+@@ -961,7 +1085,12 @@ static uint32_t fpga_tx(struct solos_car
  				tx_started |= 1 << port;
  				oldskb = skb; /* We're done with this skb already */
  			} else if (skb && card->using_dma) {
@@ -342,7 +313,7 @@ solos-pci: add GPIO support for newer versions on Geos board
  								       skb->len, PCI_DMA_TODEVICE);
  				card->tx_skb[port] = skb;
  				iowrite32(SKB_CB(skb)->dma_addr,
-@@ -1134,18 +1264,33 @@ static int fpga_probe(struct pci_dev *de
+@@ -1135,18 +1264,33 @@ static int fpga_probe(struct pci_dev *de
  		db_fpga_upgrade = db_firmware_upgrade = 0;
  	}
  
@@ -379,7 +350,7 @@ solos-pci: add GPIO support for newer versions on Geos board
  	pci_set_drvdata(dev, card);
  
  	tasklet_init(&card->tlet, solos_bh, (unsigned long)card);
-@@ -1180,6 +1325,10 @@ static int fpga_probe(struct pci_dev *de
+@@ -1181,6 +1325,10 @@ static int fpga_probe(struct pci_dev *de
  	if (err)
  		goto out_free_irq;
  
@@ -390,7 +361,7 @@ solos-pci: add GPIO support for newer versions on Geos board
  	return 0;
  
   out_free_irq:
-@@ -1188,6 +1337,7 @@ static int fpga_probe(struct pci_dev *de
+@@ -1189,6 +1337,7 @@ static int fpga_probe(struct pci_dev *de
  	tasklet_kill(&card->tlet);
  	
   out_unmap_both:
@@ -398,7 +369,7 @@ solos-pci: add GPIO support for newer versions on Geos board
  	pci_set_drvdata(dev, NULL);
  	pci_iounmap(dev, card->buffers);
   out_unmap_config:
-@@ -1290,11 +1440,16 @@ static void fpga_remove(struct pci_dev *
+@@ -1291,11 +1440,16 @@ static void fpga_remove(struct pci_dev *
  	iowrite32(1, card->config_regs + FPGA_MODE);
  	(void)ioread32(card->config_regs + FPGA_MODE); 
  
diff --git a/target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch b/target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch
index ecbcfb6..ff1a6b1 100644
--- a/target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch
+++ b/target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch
@@ -23,7 +23,7 @@
  /* The Mellanox Tavor device gives false positive parity errors
   * Mark this device with a broken_parity_status, to allow
   * PCI scanning code to "skip" this now blacklisted device.
-@@ -2844,6 +2845,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -2847,6 +2848,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
  
@@ -31,7 +31,7 @@
  
  static ktime_t fixup_debug_start(struct pci_dev *dev,
  				 void (*fn)(struct pci_dev *dev))
-@@ -2875,6 +2877,8 @@ static void fixup_debug_report(struct pc
+@@ -2878,6 +2880,8 @@ static void fixup_debug_report(struct pc
  	}
  }
  
@@ -40,7 +40,7 @@
  /*
   * Some BIOS implementations leave the Intel GPU interrupts enabled,
   * even though no one is handling them (f.e. i915 driver is never loaded).
-@@ -2909,6 +2913,8 @@ static void __devinit disable_igfx_irq(s
+@@ -2912,6 +2916,8 @@ static void __devinit disable_igfx_irq(s
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq);
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
  
diff --git a/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch
index 4b1983e..1c90a5c 100644
--- a/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch
@@ -39,7 +39,7 @@
  static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
  {
  	u16 cmd;
-@@ -971,3 +986,4 @@ static void __devinit quirk_usb_early_ha
+@@ -973,3 +988,4 @@ static void __devinit quirk_usb_early_ha
  }
  DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
  			PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
diff --git a/target/linux/generic/patches-3.7/950-vm_exports.patch b/target/linux/generic/patches-3.7/950-vm_exports.patch
index 5957d0c..f1bf3e8 100644
--- a/target/linux/generic/patches-3.7/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.7/950-vm_exports.patch
@@ -69,7 +69,7 @@
  
 --- a/mm/memory.c
 +++ b/mm/memory.c
-@@ -1415,6 +1415,7 @@ void zap_page_range(struct vm_area_struc
+@@ -1420,6 +1420,7 @@ void zap_page_range(struct vm_area_struc
  	mmu_notifier_invalidate_range_end(mm, start, end);
  	tlb_finish_mmu(&tlb, start, end);
  }