refresh 2.6.35 patches

SVN-Revision: 22772

6 files changed, 25 insertions, 24 deletions

diff --git a/target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch
index ad754decc5..0f4789a704 100644
--- a/target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch
+++ b/target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch
@@ -33,7 +33,7 @@
  /* Enable 1k I/O space granularity on the Intel P64H2 */
  static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
  {
-@@ -2556,6 +2559,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -2560,6 +2563,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
  
  #endif	/* CONFIG_PCI_IOV */
diff --git a/target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch
index 837e3a512b..f242fce377 100644
--- a/target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch
+++ b/target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch
@@ -3,8 +3,8 @@
  include/linux/mtd/nand.h     |    1 +
  2 files changed, 13 insertions(+), 1 deletion(-)
 
---- linux-2.6.35.3.orig/include/linux/mtd/nand.h
-+++ linux-2.6.35.3/include/linux/mtd/nand.h
+--- a/include/linux/mtd/nand.h
++++ b/include/linux/mtd/nand.h
 @@ -512,6 +512,7 @@ struct platform_nand_chip {
  	int			chip_delay;
  	unsigned int		options;
@@ -13,8 +13,8 @@
  	void			(*set_parts)(uint64_t size,
  					struct platform_nand_chip *chip);
  	void			*priv;
---- linux-2.6.35.3.orig/drivers/mtd/nand/plat_nand.c
-+++ linux-2.6.35.3/drivers/mtd/nand/plat_nand.c
+--- a/drivers/mtd/nand/plat_nand.c
++++ b/drivers/mtd/nand/plat_nand.c
 @@ -91,7 +91,18 @@ static int __devinit plat_nand_probe(str
  	}
  
diff --git a/target/linux/generic/patches-2.6.35/260-crypto_optional_tests.patch b/target/linux/generic/patches-2.6.35/260-crypto_optional_tests.patch
index 1b1b89586a..9273a0f554 100644
--- a/target/linux/generic/patches-2.6.35/260-crypto_optional_tests.patch
+++ b/target/linux/generic/patches-2.6.35/260-crypto_optional_tests.patch
@@ -1,8 +1,8 @@
 --- a/crypto/Kconfig
 +++ b/crypto/Kconfig
-@@ -96,6 +96,10 @@ config CRYPTO_MANAGER2
- 	select CRYPTO_BLKCIPHER2
- 	select CRYPTO_PCOMP
+@@ -104,6 +104,10 @@ config CRYPTO_MANAGER_TESTS
+ 	  Run cryptomanager's tests for the new crypto algorithms being
+ 	  registered.
  
 +config CRYPTO_MANAGER_NO_TESTS
 +	bool "Disable internal testsuite to save space"
@@ -13,7 +13,7 @@
  	depends on EXPERIMENTAL
 --- a/crypto/testmgr.c
 +++ b/crypto/testmgr.c
-@@ -47,6 +47,8 @@
+@@ -58,6 +58,8 @@ int alg_test(const char *driver, const c
  #define ENCRYPT 1
  #define DECRYPT 0
  
@@ -22,7 +22,7 @@
  struct tcrypt_result {
  	struct completion completion;
  	int err;
-@@ -2473,8 +2475,11 @@ static int alg_find_test(const char *alg
+@@ -2484,8 +2486,11 @@ static int alg_find_test(const char *alg
  	return -1;
  }
  
@@ -34,7 +34,7 @@
  	int i;
  	int j;
  	int rc;
-@@ -2529,5 +2534,8 @@ notest:
+@@ -2540,6 +2545,9 @@ notest:
  	return 0;
  non_fips_alg:
  	return -EINVAL;
@@ -42,7 +42,8 @@
 +	return 0;
 +#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
  }
- EXPORT_SYMBOL_GPL(alg_test);
+ 
+ #endif /* CONFIG_CRYPTO_MANAGER_TESTS */
 --- a/crypto/testmgr.h
 +++ b/crypto/testmgr.h
 @@ -20,6 +20,8 @@
diff --git a/target/linux/generic/patches-2.6.35/970-ocf_kbuild_integration.patch b/target/linux/generic/patches-2.6.35/970-ocf_kbuild_integration.patch
index 76413e9cef..1e95858e46 100644
--- a/target/linux/generic/patches-2.6.35/970-ocf_kbuild_integration.patch
+++ b/target/linux/generic/patches-2.6.35/970-ocf_kbuild_integration.patch
@@ -1,6 +1,6 @@
 --- a/crypto/Kconfig
 +++ b/crypto/Kconfig
-@@ -836,3 +836,6 @@ config CRYPTO_ANSI_CPRNG
+@@ -844,3 +844,6 @@ config CRYPTO_ANSI_CPRNG
  source "drivers/crypto/Kconfig"
  
  endif	# if CRYPTO
diff --git a/target/linux/generic/patches-2.6.35/975-ssb_update.patch b/target/linux/generic/patches-2.6.35/975-ssb_update.patch
index c41069cfea..6cf41cc6a0 100644
--- a/target/linux/generic/patches-2.6.35/975-ssb_update.patch
+++ b/target/linux/generic/patches-2.6.35/975-ssb_update.patch
@@ -6,8 +6,8 @@
  include/linux/ssb/ssb.h             |  159 ------------------------------------
  5 files changed, 104 insertions(+), 318 deletions(-)
 
---- linux-2.6.35.3.orig/drivers/net/b44.c
-+++ linux-2.6.35.3/drivers/net/b44.c
+--- a/drivers/net/b44.c
++++ b/drivers/net/b44.c
 @@ -135,7 +135,6 @@ static void b44_init_rings(struct b44 *)
  
  static void b44_init_hw(struct b44 *, int);
@@ -323,8 +323,8 @@
  	dma_desc_sync_size = max_t(unsigned int, dma_desc_align_size, sizeof(struct dma_desc));
  
  	err = b44_pci_init();
---- linux-2.6.35.3.orig/drivers/ssb/driver_chipcommon.c
-+++ linux-2.6.35.3/drivers/ssb/driver_chipcommon.c
+--- a/drivers/ssb/driver_chipcommon.c
++++ b/drivers/ssb/driver_chipcommon.c
 @@ -209,6 +209,24 @@ static void chipco_powercontrol_init(str
  	}
  }
@@ -363,8 +363,8 @@
  	if (!(cc->capabilities & SSB_CHIPCO_CAP_PCTL))
  		return;
  
---- linux-2.6.35.3.orig/drivers/ssb/driver_chipcommon_pmu.c
-+++ linux-2.6.35.3/drivers/ssb/driver_chipcommon_pmu.c
+--- a/drivers/ssb/driver_chipcommon_pmu.c
++++ b/drivers/ssb/driver_chipcommon_pmu.c
 @@ -502,9 +502,9 @@ static void ssb_pmu_resources_init(struc
  		chipco_write32(cc, SSB_CHIPCO_PMU_MAXRES_MSK, max_msk);
  }
@@ -398,8 +398,8 @@
  	ssb_pmu_pll_init(cc);
  	ssb_pmu_resources_init(cc);
  }
---- linux-2.6.35.3.orig/drivers/ssb/main.c
-+++ linux-2.6.35.3/drivers/ssb/main.c
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c
 @@ -486,6 +486,7 @@ static int ssb_devices_register(struct s
  #ifdef CONFIG_SSB_PCIHOST
  			sdev->irq = bus->host_pci->irq;
@@ -497,8 +497,8 @@
  int ssb_bus_may_powerdown(struct ssb_bus *bus)
  {
  	struct ssb_chipcommon *cc;
---- linux-2.6.35.3.orig/include/linux/ssb/ssb.h
-+++ linux-2.6.35.3/include/linux/ssb/ssb.h
+--- a/include/linux/ssb/ssb.h
++++ b/include/linux/ssb/ssb.h
 @@ -167,7 +167,7 @@ struct ssb_device {
  	 * is an optimization. */
  	const struct ssb_bus_ops *ops;
diff --git a/target/linux/generic/patches-2.6.35/980-vm_exports.patch b/target/linux/generic/patches-2.6.35/980-vm_exports.patch
index f5f73d7bb0..c372e95703 100644
--- a/target/linux/generic/patches-2.6.35/980-vm_exports.patch
+++ b/target/linux/generic/patches-2.6.35/980-vm_exports.patch
@@ -76,7 +76,7 @@
   * macro override instead of weak attribute alias, to workaround
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
-@@ -4271,6 +4271,7 @@ int can_nice(const struct task_struct *p
+@@ -4261,6 +4261,7 @@ int can_nice(const struct task_struct *p
  	return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
  		capable(CAP_SYS_NICE));
  }