Changeset 22772


Ignore:
Timestamp:
2010-08-22T19:09:18+02:00 (6 years ago)
Author:
florian
Message:

[kernel] refresh 2.6.35 patches

Location:
trunk/target/linux/generic/patches-2.6.35
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch

    r22252 r22772  
    3434 static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) 
    3535 { 
    36 @@ -2556,6 +2559,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I 
     36@@ -2560,6 +2563,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I 
    3737 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov); 
    3838  
  • trunk/target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch

    r22753 r22772  
    44 2 files changed, 13 insertions(+), 1 deletion(-) 
    55 
    6 --- linux-2.6.35.3.orig/include/linux/mtd/nand.h 
    7 +++ linux-2.6.35.3/include/linux/mtd/nand.h 
     6--- a/include/linux/mtd/nand.h 
     7+++ b/include/linux/mtd/nand.h 
    88@@ -512,6 +512,7 @@ struct platform_nand_chip { 
    99        int                     chip_delay; 
     
    1414                                        struct platform_nand_chip *chip); 
    1515        void                    *priv; 
    16 --- linux-2.6.35.3.orig/drivers/mtd/nand/plat_nand.c 
    17 +++ linux-2.6.35.3/drivers/mtd/nand/plat_nand.c 
     16--- a/drivers/mtd/nand/plat_nand.c 
     17+++ b/drivers/mtd/nand/plat_nand.c 
    1818@@ -91,7 +91,18 @@ static int __devinit plat_nand_probe(str 
    1919        } 
  • trunk/target/linux/generic/patches-2.6.35/260-crypto_optional_tests.patch

    r22252 r22772  
    11--- a/crypto/Kconfig 
    22+++ b/crypto/Kconfig 
    3 @@ -96,6 +96,10 @@ config CRYPTO_MANAGER2 
    4         select CRYPTO_BLKCIPHER2 
    5         select CRYPTO_PCOMP 
     3@@ -104,6 +104,10 @@ config CRYPTO_MANAGER_TESTS 
     4          Run cryptomanager's tests for the new crypto algorithms being 
     5          registered. 
    66  
    77+config CRYPTO_MANAGER_NO_TESTS 
     
    1414--- a/crypto/testmgr.c 
    1515+++ b/crypto/testmgr.c 
    16 @@ -47,6 +47,8 @@ 
     16@@ -58,6 +58,8 @@ int alg_test(const char *driver, const c 
    1717 #define ENCRYPT 1 
    1818 #define DECRYPT 0 
     
    2323        struct completion completion; 
    2424        int err; 
    25 @@ -2473,8 +2475,11 @@ static int alg_find_test(const char *alg 
     25@@ -2484,8 +2486,11 @@ static int alg_find_test(const char *alg 
    2626        return -1; 
    2727 } 
     
    3535        int j; 
    3636        int rc; 
    37 @@ -2529,5 +2534,8 @@ notest: 
     37@@ -2540,6 +2545,9 @@ notest: 
    3838        return 0; 
    3939 non_fips_alg: 
     
    4343+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */ 
    4444 } 
    45  EXPORT_SYMBOL_GPL(alg_test); 
     45  
     46 #endif /* CONFIG_CRYPTO_MANAGER_TESTS */ 
    4647--- a/crypto/testmgr.h 
    4748+++ b/crypto/testmgr.h 
  • trunk/target/linux/generic/patches-2.6.35/970-ocf_kbuild_integration.patch

    r21952 r22772  
    11--- a/crypto/Kconfig 
    22+++ b/crypto/Kconfig 
    3 @@ -836,3 +836,6 @@ config CRYPTO_ANSI_CPRNG 
     3@@ -844,3 +844,6 @@ config CRYPTO_ANSI_CPRNG 
    44 source "drivers/crypto/Kconfig" 
    55  
  • trunk/target/linux/generic/patches-2.6.35/975-ssb_update.patch

    r22753 r22772  
    77 5 files changed, 104 insertions(+), 318 deletions(-) 
    88 
    9 --- linux-2.6.35.3.orig/drivers/net/b44.c 
    10 +++ linux-2.6.35.3/drivers/net/b44.c 
     9--- a/drivers/net/b44.c 
     10+++ b/drivers/net/b44.c 
    1111@@ -135,7 +135,6 @@ static void b44_init_rings(struct b44 *) 
    1212  
     
    324324  
    325325        err = b44_pci_init(); 
    326 --- linux-2.6.35.3.orig/drivers/ssb/driver_chipcommon.c 
    327 +++ linux-2.6.35.3/drivers/ssb/driver_chipcommon.c 
     326--- a/drivers/ssb/driver_chipcommon.c 
     327+++ b/drivers/ssb/driver_chipcommon.c 
    328328@@ -209,6 +209,24 @@ static void chipco_powercontrol_init(str 
    329329        } 
     
    364364                return; 
    365365  
    366 --- linux-2.6.35.3.orig/drivers/ssb/driver_chipcommon_pmu.c 
    367 +++ linux-2.6.35.3/drivers/ssb/driver_chipcommon_pmu.c 
     366--- a/drivers/ssb/driver_chipcommon_pmu.c 
     367+++ b/drivers/ssb/driver_chipcommon_pmu.c 
    368368@@ -502,9 +502,9 @@ static void ssb_pmu_resources_init(struc 
    369369                chipco_write32(cc, SSB_CHIPCO_PMU_MAXRES_MSK, max_msk); 
     
    399399        ssb_pmu_resources_init(cc); 
    400400 } 
    401 --- linux-2.6.35.3.orig/drivers/ssb/main.c 
    402 +++ linux-2.6.35.3/drivers/ssb/main.c 
     401--- a/drivers/ssb/main.c 
     402+++ b/drivers/ssb/main.c 
    403403@@ -486,6 +486,7 @@ static int ssb_devices_register(struct s 
    404404 #ifdef CONFIG_SSB_PCIHOST 
     
    498498 { 
    499499        struct ssb_chipcommon *cc; 
    500 --- linux-2.6.35.3.orig/include/linux/ssb/ssb.h 
    501 +++ linux-2.6.35.3/include/linux/ssb/ssb.h 
     500--- a/include/linux/ssb/ssb.h 
     501+++ b/include/linux/ssb/ssb.h 
    502502@@ -167,7 +167,7 @@ struct ssb_device { 
    503503         * is an optimization. */ 
  • trunk/target/linux/generic/patches-2.6.35/980-vm_exports.patch

    r22540 r22772  
    7777--- a/kernel/sched.c 
    7878+++ b/kernel/sched.c 
    79 @@ -4271,6 +4271,7 @@ int can_nice(const struct task_struct *p 
     79@@ -4261,6 +4261,7 @@ int can_nice(const struct task_struct *p 
    8080        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || 
    8181                capable(CAP_SYS_NICE)); 
Note: See TracChangeset for help on using the changeset viewer.