[kernel] refresh 2.6.35 patches
authorFlorian Fainelli <florian@openwrt.org>
Sun, 22 Aug 2010 17:09:18 +0000 (17:09 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Sun, 22 Aug 2010 17:09:18 +0000 (17:09 +0000)
SVN-Revision: 22772

target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch
target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch
target/linux/generic/patches-2.6.35/260-crypto_optional_tests.patch
target/linux/generic/patches-2.6.35/970-ocf_kbuild_integration.patch
target/linux/generic/patches-2.6.35/975-ssb_update.patch
target/linux/generic/patches-2.6.35/980-vm_exports.patch

index ad754de..0f4789a 100644 (file)
@@ -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 */
index 837e3a5..f242fce 100644 (file)
@@ -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
        }
  
index 1b1b895..9273a0f 100644 (file)
@@ -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 @@
index 76413e9..1e95858 100644 (file)
@@ -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
index c41069c..6cf41cc 100644 (file)
@@ -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);
        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
        }
  }
        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);
  }
        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;
  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;
index f5f73d7..c372e95 100644 (file)
@@ -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));
  }