kernel: refresh 2.6.38 patches for final release

SVN-Revision: 26194

diff --git a/target/linux/generic/patches-2.6.38/010-debloat_lzma.patch b/target/linux/generic/patches-2.6.38/010-debloat_lzma.patch
index 1e41661ebb60fdbfa7e0ba613e236e4e0d94405a..18e4a51ee35b7226321708364bfa5466ab5c38cd 100644 (file)
--- a/target/linux/generic/patches-2.6.38/010-debloat_lzma.patch
+++ b/target/linux/generic/patches-2.6.38/010-debloat_lzma.patch
@@ -124,7 +124,7 @@
  /* LzmaDecode
 --- a/lib/lzma/LzmaDec.c
 +++ b/lib/lzma/LzmaDec.c
-@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p,
+@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, 
    p->needFlush = 0;
  }
  
@@ -194,7 +194,7 @@
  {
    CLzmaProps propNew;
    RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-@@ -944,7 +944,7 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p,
+@@ -944,7 +944,7 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p, 
    return SZ_OK;
  }
  
@@ -375,7 +375,7 @@
  void MatchFinder_Construct(CMatchFinder *p);
  
  /* Conditions:
-@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p,
+@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, 
      UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
      ISzAlloc *alloc);
  void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);

diff --git a/target/linux/generic/patches-2.6.38/011-mips_expose_boot_raw.patch b/target/linux/generic/patches-2.6.38/011-mips_expose_boot_raw.patch
index 41b3784daa5906f4cff0233a1d39bc2808315c85..bd83f665a397afaf68723cc95f601ecfd1898514 100644 (file)
--- a/target/linux/generic/patches-2.6.38/011-mips_expose_boot_raw.patch
+++ b/target/linux/generic/patches-2.6.38/011-mips_expose_boot_raw.patch
@@ -8,7 +8,7 @@ Acked-by: Rob Landley <rob@landley.net>
 ---
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -802,9 +802,6 @@ config ARC
+@@ -806,9 +806,6 @@ config ARC
  config ARCH_MAY_HAVE_PC_FDC
        bool
  
@@ -18,7 +18,7 @@ Acked-by: Rob Landley <rob@landley.net>
  config CEVT_BCM1480
        bool
  
-@@ -2240,6 +2237,18 @@ config USE_OF
+@@ -2244,6 +2241,18 @@ config USE_OF
        help
          Include support for flattened device tree machine descriptions.
  

diff --git a/target/linux/generic/patches-2.6.38/014-cfi_show_amd_extended_table_version.patch b/target/linux/generic/patches-2.6.38/014-cfi_show_amd_extended_table_version.patch
index 2369a19fac16614f752a587360262a21158193f3..7111b2193c648ee6bd48493137f053f8feb53c1d 100644 (file)
--- a/target/linux/generic/patches-2.6.38/014-cfi_show_amd_extended_table_version.patch
+++ b/target/linux/generic/patches-2.6.38/014-cfi_show_amd_extended_table_version.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -462,9 +462,9 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -462,9 +462,9 @@ struct mtd_info *cfi_cmdset_0002(struct 
  
                        /*
                         * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4

diff --git a/target/linux/generic/patches-2.6.38/021-mips_image_cmdline_hack.patch b/target/linux/generic/patches-2.6.38/021-mips_image_cmdline_hack.patch
index 52466ef363431370369c16e8cca153b13fd19327..b499334556423775aa792c1b076dc6690206eac9 100644 (file)
--- a/target/linux/generic/patches-2.6.38/021-mips_image_cmdline_hack.patch
+++ b/target/linux/generic/patches-2.6.38/021-mips_image_cmdline_hack.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -898,6 +898,10 @@ config SYNC_R4K
+@@ -902,6 +902,10 @@ config SYNC_R4K
  config MIPS_MACHINE
        def_bool n
  

diff --git a/target/linux/generic/patches-2.6.38/025-mips_disable_fpu.patch b/target/linux/generic/patches-2.6.38/025-mips_disable_fpu.patch
index 732809b1ecfe49e53205775fc2b807296df28513..d1f60df64d212ccea42aa009a830f5ca5c07bb69 100644 (file)
--- a/target/linux/generic/patches-2.6.38/025-mips_disable_fpu.patch
+++ b/target/linux/generic/patches-2.6.38/025-mips_disable_fpu.patch
@@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
 --
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -883,6 +883,17 @@ config I8259
+@@ -887,6 +887,17 @@ config I8259
  config MIPS_BONITO64
        bool
  

diff --git a/target/linux/generic/patches-2.6.38/040-arm_update_mach-types.patch b/target/linux/generic/patches-2.6.38/040-arm_update_mach-types.patch
index 543900348de644752be15875ff48b3340b958457..8f08864f21e82e7c70d26d936c1080bc0e01c530 100644 (file)
--- a/target/linux/generic/patches-2.6.38/040-arm_update_mach-types.patch
+++ b/target/linux/generic/patches-2.6.38/040-arm_update_mach-types.patch
@@ -49,7 +49,7 @@
  htc_excalibur_s620    MACH_HTC_EXCALIBUR_S620 HTC_EXCALIBUR_S620      2391
  htc_opal              MACH_HTC_OPAL           HTC_OPAL                2392
  touchbook             MACH_TOUCHBOOK          TOUCHBOOK               2393
-@@ -2446,7 +2441,6 @@ siogentoo1               MACH_SIOGENTOO1         SIOGENTOO1
+@@ -2446,7 +2441,6 @@ siogentoo1               MACH_SIOGENTOO1         SIOGENTOO1      
  siogentoo2            MACH_SIOGENTOO2         SIOGENTOO2              2459
  sm3k                  MACH_SM3K               SM3K                    2460
  acer_tempo_f900               MACH_ACER_TEMPO_F900    ACER_TEMPO_F900         2461

diff --git a/target/linux/generic/patches-2.6.38/065-rootfs_split.patch b/target/linux/generic/patches-2.6.38/065-rootfs_split.patch
index bd94b18ad44a71220c23183227dda3dc3d825b40..7a82354dd75f1d1b5e75a3f289b3371de7b097b7 100644 (file)
--- a/target/linux/generic/patches-2.6.38/065-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.38/065-rootfs_split.patch
@@ -548,7 +548,7 @@
        part->name = dev->mtd.name;
 --- a/drivers/mtd/mtdchar.c
 +++ b/drivers/mtd/mtdchar.c
-@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file,
+@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file, 
                file->f_pos = 0;
                break;
        }

diff --git a/target/linux/generic/patches-2.6.38/100-netfilter_layer7_2.22.patch b/target/linux/generic/patches-2.6.38/100-netfilter_layer7_2.22.patch
index 88b656b5e4d7a89291d56e6c9f77c8d6c66c4f17..58732b8ffd1321aa070ae7ec9faf12191f8f2a0a 100644 (file)
--- a/target/linux/generic/patches-2.6.38/100-netfilter_layer7_2.22.patch
+++ b/target/linux/generic/patches-2.6.38/100-netfilter_layer7_2.22.patch
@@ -30,7 +30,7 @@
        depends on NETFILTER_ADVANCED
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
-@@ -95,6 +95,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
+@@ -95,6 +95,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
  obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o

diff --git a/target/linux/generic/patches-2.6.38/202-mips_mem_functions_performance.patch b/target/linux/generic/patches-2.6.38/202-mips_mem_functions_performance.patch
index e4324717b4459ce1f1009053e6317c930b01b6e4..6ea9ba51ee0d24cf3a3ac657278109d9b11de859 100644 (file)
--- a/target/linux/generic/patches-2.6.38/202-mips_mem_functions_performance.patch
+++ b/target/linux/generic/patches-2.6.38/202-mips_mem_functions_performance.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/include/asm/string.h
 +++ b/arch/mips/include/asm/string.h
-@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
+@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ 
  
  #define __HAVE_ARCH_MEMSET
  extern void *memset(void *__s, int __c, size_t __count);

diff --git a/target/linux/generic/patches-2.6.38/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic/patches-2.6.38/210-mini_fo_2.6.25_fixes.patch
index d021ec1b309347e8ece84b6885d6f2ac97f22ed9..826eb44dff3e214d78027bef349ff5ae7f4e2db1 100644 (file)
--- a/target/linux/generic/patches-2.6.38/210-mini_fo_2.6.25_fixes.patch
+++ b/target/linux/generic/patches-2.6.38/210-mini_fo_2.6.25_fixes.patch
@@ -61,7 +61,7 @@
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
  extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
  
-@@ -501,6 +505,29 @@ static inline void double_unlock(struct
+@@ -501,6 +505,29 @@ static inline void double_unlock(struct 
  #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
  #endif /* __KERNEL__ */
  
@@ -127,7 +127,7 @@
  #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
 --- a/fs/mini_fo/aux.c
 +++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
+@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, 
        err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
  
        /* validate */

diff --git a/target/linux/generic/patches-2.6.38/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic/patches-2.6.38/212-mini_fo_2.6.26_fixes.patch
index d2a843c82ee77b1c57f51b935313443eabc290de..37503710c83afd8e41705eaf8397e6740273b33a 100644 (file)
--- a/target/linux/generic/patches-2.6.38/212-mini_fo_2.6.26_fixes.patch
+++ b/target/linux/generic/patches-2.6.38/212-mini_fo_2.6.26_fixes.patch
@@ -1,6 +1,6 @@
 --- a/fs/mini_fo/super.c
 +++ b/fs/mini_fo/super.c
-@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
+@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int 
  #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
  
  

diff --git a/target/linux/generic/patches-2.6.38/218-mini_fo_fix_2_6_38.patch b/target/linux/generic/patches-2.6.38/218-mini_fo_fix_2_6_38.patch
index ad257f0847d7284964913eefe5323a2ed3f95e61..22ac42c91765641602147c4e6b229f42f8a16a50 100644 (file)
--- a/target/linux/generic/patches-2.6.38/218-mini_fo_fix_2_6_38.patch
+++ b/target/linux/generic/patches-2.6.38/218-mini_fo_fix_2_6_38.patch
@@ -9,7 +9,7 @@
  {
        int err = 0;
        dentry_t *hidden_dentry;
-@@ -96,7 +96,7 @@ mini_fo_d_hash(dentry_t *dentry, qstr_t
+@@ -96,7 +96,7 @@ mini_fo_d_hash(dentry_t *dentry, qstr_t 
                if(hidden_sto_dentry &&
                   hidden_sto_dentry->d_op &&
                   hidden_sto_dentry->d_op->d_hash) {
@@ -18,7 +18,7 @@
                }
                goto out;
        }
-@@ -106,7 +106,7 @@ mini_fo_d_hash(dentry_t *dentry, qstr_t
+@@ -106,7 +106,7 @@ mini_fo_d_hash(dentry_t *dentry, qstr_t 
                if(hidden_dentry &&
                   hidden_dentry->d_op &&
                   hidden_dentry->d_op->d_hash) {
@@ -27,7 +27,7 @@
                }
                goto out;
        }
-@@ -116,14 +116,14 @@ mini_fo_d_hash(dentry_t *dentry, qstr_t
+@@ -116,14 +116,14 @@ mini_fo_d_hash(dentry_t *dentry, qstr_t 
                if(hidden_sto_dentry &&
                   hidden_sto_dentry->d_op &&
                   hidden_sto_dentry->d_op->d_hash) {
@@ -44,7 +44,7 @@
                        goto out;
                }
        }
-@@ -136,21 +136,25 @@ mini_fo_d_hash(dentry_t *dentry, qstr_t
+@@ -136,21 +136,25 @@ mini_fo_d_hash(dentry_t *dentry, qstr_t 
  
  
  STATIC int

diff --git a/target/linux/generic/patches-2.6.38/223-kobject-add-broadcast_uevent.patch b/target/linux/generic/patches-2.6.38/223-kobject-add-broadcast_uevent.patch
index 7b36ab61155852435502d646418fe1ff151b1081..b3e4b6e7c75b08e80bb482f2d3e49d7027c8547f 100644 (file)
--- a/target/linux/generic/patches-2.6.38/223-kobject-add-broadcast_uevent.patch
+++ b/target/linux/generic/patches-2.6.38/223-kobject-add-broadcast_uevent.patch
@@ -20,7 +20,7 @@
  #else
  static inline int kobject_uevent(struct kobject *kobj,
                                 enum kobject_action action)
-@@ -231,6 +237,16 @@ static inline int add_uevent_var(struct
+@@ -231,6 +237,16 @@ static inline int add_uevent_var(struct 
  static inline int kobject_action_type(const char *buf, size_t count,
                                      enum kobject_action *type)
  { return -EINVAL; }

diff --git a/target/linux/generic/patches-2.6.38/271-bridge_always_accept_eap.patch b/target/linux/generic/patches-2.6.38/271-bridge_always_accept_eap.patch
index e9bcabe6feb859b6dfcdf3e1eca27057e49106e6..b3a793e49b15f00c5b37bb193cb039a3ae21ba42 100644 (file)
--- a/target/linux/generic/patches-2.6.38/271-bridge_always_accept_eap.patch
+++ b/target/linux/generic/patches-2.6.38/271-bridge_always_accept_eap.patch
@@ -1,6 +1,6 @@
 --- a/net/bridge/br_input.c
 +++ b/net/bridge/br_input.c
-@@ -60,7 +60,7 @@ int br_handle_frame_finish(struct sk_buf
+@@ -64,7 +64,7 @@ int br_handle_frame_finish(struct sk_buf
            br_multicast_rcv(br, p, skb))
                goto drop;
  

diff --git a/target/linux/generic/patches-2.6.38/400-ledtrig_morse.patch b/target/linux/generic/patches-2.6.38/400-ledtrig_morse.patch
index 8d901845564cc440a65994f6f8970b37fbdd3e2c..62a90a4591698bb871982438fc9871c6cbd97efb 100644 (file)
--- a/target/linux/generic/patches-2.6.38/400-ledtrig_morse.patch
+++ b/target/linux/generic/patches-2.6.38/400-ledtrig_morse.patch
@@ -11,7 +11,7 @@
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -52,3 +52,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) +=
+@@ -52,3 +52,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += 
  obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)  += ledtrig-backlight.o
  obj-$(CONFIG_LEDS_TRIGGER_GPIO)               += ledtrig-gpio.o
  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o

diff --git a/target/linux/generic/patches-2.6.38/402-ledtrig_netdev.patch b/target/linux/generic/patches-2.6.38/402-ledtrig_netdev.patch
index 6406adac2a03d1c606b2129ffb3fbda2f355a9c8..5354aa187bab0c24efe9f1cadfa98a56f18a3b31 100644 (file)
--- a/target/linux/generic/patches-2.6.38/402-ledtrig_netdev.patch
+++ b/target/linux/generic/patches-2.6.38/402-ledtrig_netdev.patch
@@ -14,7 +14,7 @@
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -53,3 +53,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) +=
+@@ -53,3 +53,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += 
  obj-$(CONFIG_LEDS_TRIGGER_GPIO)               += ledtrig-gpio.o
  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
  obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o

diff --git a/target/linux/generic/patches-2.6.38/411-gpio_ioctl.patch b/target/linux/generic/patches-2.6.38/411-gpio_ioctl.patch
index 3b7063223ecda6601e050f7f19b8719af17b00dc..6609a1670af5e5d3297b09bbc6baf6cc0c67880b 100644 (file)
--- a/target/linux/generic/patches-2.6.38/411-gpio_ioctl.patch
+++ b/target/linux/generic/patches-2.6.38/411-gpio_ioctl.patch
@@ -1,6 +1,6 @@
 --- a/drivers/char/gpio_dev.c
 +++ b/drivers/char/gpio_dev.c
-@@ -114,7 +114,7 @@ gpio_close(struct inode * inode, struct
+@@ -114,7 +114,7 @@ gpio_close(struct inode * inode, struct 
  }
  
  struct file_operations gpio_fops = {

diff --git a/target/linux/generic/patches-2.6.38/511-yaffs-cvs-2009-04-24.patch b/target/linux/generic/patches-2.6.38/511-yaffs-cvs-2009-04-24.patch
index c334b17d0872a877f52cd9c0e4234ad118df7d09..5c70e79a058d050e90224ac0ef80dcb1180235ab 100644 (file)
--- a/target/linux/generic/patches-2.6.38/511-yaffs-cvs-2009-04-24.patch
+++ b/target/linux/generic/patches-2.6.38/511-yaffs-cvs-2009-04-24.patch
@@ -601,7 +601,7 @@
                        dev->checkpointBlockList[i] = -1;
        }
  
-@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device
+@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device 
  
  static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
  {
@@ -926,7 +926,7 @@
  {
        unsigned char cDelta;   /* column parity delta */
        unsigned lDelta;        /* line parity delta */
-@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char 
                return 0; /* no error */
  
        if (lDelta == ~lDeltaPrime &&
@@ -936,7 +936,7 @@
                /* Single bit (recoverable) error in data */
  
                bit = 0;
-@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char 
                if (cDelta & 0x02)
                        bit |= 0x01;
  
@@ -945,7 +945,7 @@
                        return -1;
  
                data[lDelta] ^= (1 << bit);
-@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char 
        }
  
        if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
@@ -954,7 +954,7 @@
                /* Reccoverable error in ecc */
  
                *read_ecc = *test_ecc;
-@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char 
        /* Unrecoverable error */
  
        return -1;
@@ -1398,7 +1398,7 @@
  {
        unsigned char *alias;
        int ret;
-@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry
+@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry 
        return ret;
  }
  
@@ -1560,7 +1560,7 @@
  static int yaffs_file_flush(struct file *file, fl_owner_t id)
  #else
  static int yaffs_file_flush(struct file *file)
-@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file
+@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file 
        yaffs_Device *dev = obj->myDev;
  
        T(YAFFS_TRACE_OS,
@@ -1571,7 +1571,7 @@
  
        yaffs_GrossLock(dev);
  
-@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct
+@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct 
  
        yaffs_Device *dev;
  
@@ -1591,7 +1591,7 @@
        BUG_ON(!PageLocked(pg));
  #else
        if (!PageLocked(pg))
-@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct
+@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct 
  
        yaffs_GrossLock(dev);
  
@@ -1604,7 +1604,7 @@
  
        yaffs_GrossUnlock(dev);
  
-@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct
+@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct 
        flush_dcache_page(pg);
        kunmap(pg);
  
@@ -3193,7 +3193,7 @@
                if (n < step) {
                        n++;
                        continue;
-@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file
+@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file 
        char *end;
        char *mask_name;
        const char *x;
@@ -3202,7 +3202,7 @@
        int i;
        int done = 0;
        int add, len = 0;
-@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file
+@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file 
  
        while (!done && (pos < count)) {
                done = 1;
@@ -3213,7 +3213,7 @@
  
                switch (buf[pos]) {
                case '+':
-@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file
+@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file 
                mask_name = NULL;
  
                mask_bitfield = simple_strtoul(buf + pos, &end, 0);
@@ -3240,7 +3240,7 @@
                                        mask_name = mask_flags[i].mask_name;
                                        mask_bitfield = mask_flags[i].mask_bitfield;
                                        done = 0;
-@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file
+@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file 
  
                if (mask_name != NULL) {
                        done = 0;
@@ -3249,7 +3249,7 @@
                        case '-':
                                rg &= ~mask_bitfield;
                                break;
-@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file
+@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file 
  
        yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
  
@@ -5691,7 +5691,7 @@
  {
        /* Get the real object in case we were fed a hard link as an equivalent object */
        equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
-@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object *
+@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object * 
  
  }
  
@@ -7622,7 +7622,7 @@
        int nToCopy;
        int n = nBytes;
        int nDone = 0;
-@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object 
        dev = in->myDev;
  
        while (n > 0) {
@@ -7657,7 +7657,7 @@
                        if (dev->nShortOpCaches > 0) {
  
                                /* If we can't find the data in the cache, then load it up. */
-@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object 
  
                                cache->locked = 1;
  
@@ -7673,7 +7673,7 @@
                                cache->locked = 0;
                        } else {
                                /* Read into the local buffer then copy..*/
-@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object 
                                    yaffs_GetTempBuffer(dev, __LINE__);
                                yaffs_ReadChunkDataFromObject(in, chunk,
                                                              localBuffer);
@@ -7718,7 +7718,7 @@
                }
  
                n -= nToCopy;
-@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object 
        return nDone;
  }
  
@@ -7923,7 +7923,7 @@
        int newFullChunks;
  
        yaffs_Device *dev = in->myDev;
-@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in,
+@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in, 
  
        yaffs_CheckGarbageCollection(dev);
  
@@ -7941,7 +7941,7 @@
  
        if (newSize < oldFileSize) {
  
-@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in,
+@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in, 
        }
  
  
@@ -7968,7 +7968,7 @@
  {
        obj = yaffs_GetEquivalentObject(obj);
  
-@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object *
+@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object * 
  
  
  
@@ -9789,7 +9789,7 @@
  {
        int init_failed = 0;
        unsigned x;
-@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device * 
        dev->chunkOffset = 0;
        dev->nFreeChunks = 0;
  
@@ -9798,7 +9798,7 @@
        if (dev->startBlock == 0) {
                dev->internalStartBlock = dev->startBlock + 1;
                dev->internalEndBlock = dev->endBlock + 1;
-@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
  
        /* Check geometry parameters. */
  
@@ -9823,7 +9823,7 @@
                return YAFFS_FAIL;
        }
  
-@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device * 
                return YAFFS_FAIL;
        }
  
@@ -9836,7 +9836,7 @@
        /* Got the right mix of functions? */
        if (!yaffs_CheckDevFunctions(dev)) {
                /* Function missing */
-@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
  
        dev->isMounted = 1;
  
@@ -9875,7 +9875,7 @@
  
        /*
         * Calculate chunkGroupBits.
-@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device * 
        bits = ShiftsGE(x);
  
        /* Set up tnode width if wide tnodes are enabled. */
@@ -9896,7 +9896,7 @@
                dev->tnodeWidth = 16;
  
        dev->tnodeMask = (1<<dev->tnodeWidth)-1;
-@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
        dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
  
        /* Initialise temporary buffers and caches. */
@@ -9905,7 +9905,7 @@
                init_failed = 1;
  
        dev->srCache = NULL;
-@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device * 
        if (!init_failed &&
            dev->nShortOpCaches > 0) {
                int i;
@@ -9940,7 +9940,7 @@
                        init_failed = 1;
  
                dev->srLastUse = 0;
-@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device * 
  
        dev->cacheHits = 0;
  
@@ -9979,7 +9979,7 @@
                                T(YAFFS_TRACE_ALWAYS,
                                  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
                        } else {
-@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device * 
                                dev->nBackgroundDeletions = 0;
                                dev->oldestDirtySequence = 0;
  
@@ -10011,7 +10011,7 @@
                /* Clean up the mess */
                T(YAFFS_TRACE_TRACING,
                  (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
-@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
  
  }
  
@@ -10710,7 +10710,7 @@
  {
        if (etags) {
                memset(etags, 0, sizeof(*etags));
-@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags *
+@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags * 
   * Returns YAFFS_OK or YAFFS_FAIL.
   */
  int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
@@ -11038,14 +11038,14 @@
 +                      yaffs_UnpackTags2(tags, &pt);
 +              }
 +      }
-+
+ 
+-      if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
+-              tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
 +      if (localData)
 +              yaffs_ReleaseTempBuffer(dev, data, __LINE__);
  
--      if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
 +      if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-               tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
--
++              tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
        if (retval == 0)
                return YAFFS_OK;
        else

diff --git a/target/linux/generic/patches-2.6.38/511-yaffs-git-2010-10-20.patch b/target/linux/generic/patches-2.6.38/511-yaffs-git-2010-10-20.patch
index c83066e99dc04c46034fa8555f8bd504fc2df9a8..f5e7fff6e618b4515ee01a561b6a7f3ceea715ec 100644 (file)
--- a/target/linux/generic/patches-2.6.38/511-yaffs-git-2010-10-20.patch
+++ b/target/linux/generic/patches-2.6.38/511-yaffs-git-2010-10-20.patch
@@ -316,7 +316,7 @@
  chunk/page state.  This byte is zeroed when the page is discarded.
  Choose this option if you have existing on-NAND data in this format
  that you need to continue to support.  New data written also uses the
-@@ -57,7 +78,7 @@ adjusted to use the older-style format.
+@@ -57,7 +78,7 @@ adjusted to use the older-style format. 
  MTD versions in yaffs_mtdif1.c.
  */
  /* Default: Not selected */
@@ -1614,7 +1614,7 @@
                        yaffs_ECCOther *read_ecc,
                        const yaffs_ECCOther *test_ecc)
  {
-@@ -304,7 +301,7 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -304,7 +301,7 @@ int yaffs_ECCCorrectOther(unsigned char 
                if (cDelta & 0x02)
                        bit |= 0x01;
  
@@ -1623,7 +1623,7 @@
                        return -1;
  
                data[lDelta] ^= (1 << bit);
-@@ -312,8 +309,8 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -312,8 +309,8 @@ int yaffs_ECCCorrectOther(unsigned char 
                return 1; /* corrected */
        }
  

diff --git a/target/linux/generic/patches-2.6.38/903-hostap_txpower.patch b/target/linux/generic/patches-2.6.38/903-hostap_txpower.patch
index 374a2844546e33659a967441dc8808fc31d0d8ba..e4c1803ff54698d8e33e2f53c57ed9e63745ff36 100644 (file)
--- a/target/linux/generic/patches-2.6.38/903-hostap_txpower.patch
+++ b/target/linux/generic/patches-2.6.38/903-hostap_txpower.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/hostap/hostap_ap.c
 +++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2338,13 +2338,13 @@ int prism2_ap_get_sta_qual(local_info_t
+@@ -2338,13 +2338,13 @@ int prism2_ap_get_sta_qual(local_info_t 
                addr[count].sa_family = ARPHRD_ETHER;
                memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
                if (sta->last_rx_silence == 0)

diff --git a/target/linux/generic/patches-2.6.38/922-gpiommc.patch b/target/linux/generic/patches-2.6.38/922-gpiommc.patch
index d0e9e214b8c73aac8a048cbca59e97e38c503dd9..a959b978cb6ea73b9c4cf14ee2bb118b767cbd2e 100644 (file)
--- a/target/linux/generic/patches-2.6.38/922-gpiommc.patch
+++ b/target/linux/generic/patches-2.6.38/922-gpiommc.patch
@@ -829,7 +829,7 @@
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -2867,6 +2867,11 @@ T:      git git://git.kernel.org/pub/scm/linu
+@@ -2884,6 +2884,11 @@ T:      git git://git.kernel.org/pub/scm/linu
  S:    Maintained
  F:    drivers/media/video/gspca/
  

diff --git a/target/linux/generic/patches-2.6.38/941-ssb_update.patch b/target/linux/generic/patches-2.6.38/941-ssb_update.patch
index a81b07e26fc1ec2973094966c1fa49caf59d0f58..0d86b7e589c46472f4b5396fd06013d844633224 100644 (file)
--- a/target/linux/generic/patches-2.6.38/941-ssb_update.patch
+++ b/target/linux/generic/patches-2.6.38/941-ssb_update.patch
@@ -88,7 +88,7 @@
        }
        SPEX(ant_available_a, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_A,
             SSB_SPROM4_ANTAVAIL_A_SHIFT);
-@@ -641,7 +645,7 @@ static int sprom_extract(struct ssb_bus
+@@ -641,7 +645,7 @@ static int sprom_extract(struct ssb_bus 
                break;
        default:
                ssb_printk(KERN_WARNING PFX "Unsupported SPROM"

diff --git a/target/linux/generic/patches-2.6.38/971-ocf_20100325.patch b/target/linux/generic/patches-2.6.38/971-ocf_20100325.patch
index 410384c28f0dc6a42f8e8252bf03775f198e82b2..a1c088a9a8d7b102216f74c4d2e6de89aee71dfc 100644 (file)
--- a/target/linux/generic/patches-2.6.38/971-ocf_20100325.patch
+++ b/target/linux/generic/patches-2.6.38/971-ocf_20100325.patch
@@ -24,7 +24,7 @@
   * All of these routines try to estimate how many bits of randomness a
   * particular randomness source.  They do this by keeping track of the
   * first and second order deltas of the event timings.
-@@ -715,6 +725,61 @@ void add_disk_randomness(struct gendisk
+@@ -715,6 +725,61 @@ void add_disk_randomness(struct gendisk 
  }
  #endif
  

diff --git a/target/linux/generic/patches-2.6.38/980-vm_exports.patch b/target/linux/generic/patches-2.6.38/980-vm_exports.patch
index 811b23b349a3fcd495237b42140d8e1371a1d695..9bafb4870dd335992a5cdc698c67f840edbbbdd9 100644 (file)
--- a/target/linux/generic/patches-2.6.38/980-vm_exports.patch
+++ b/target/linux/generic/patches-2.6.38/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
-@@ -4640,6 +4640,7 @@ int can_nice(const struct task_struct *p
+@@ -4641,6 +4641,7 @@ int can_nice(const struct task_struct *p
        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
                capable(CAP_SYS_NICE));
  }
@@ -94,7 +94,7 @@
  
  /**
   * zap_vma_ptes - remove ptes mapping the vma
-@@ -2690,6 +2691,7 @@ int vmtruncate_range(struct inode *inode
+@@ -2692,6 +2693,7 @@ int vmtruncate_range(struct inode *inode
  
        return 0;
  }

diff --git a/target/linux/generic/patches-2.6.38/982-make-config-average-selectable.patch b/target/linux/generic/patches-2.6.38/982-make-config-average-selectable.patch
index a87d269c02a4b56d94ddb0c2034327ef68d29105..18fff0aa559b17c69fb6c56f313b32f08f110ef3 100644 (file)
--- a/target/linux/generic/patches-2.6.38/982-make-config-average-selectable.patch
+++ b/target/linux/generic/patches-2.6.38/982-make-config-average-selectable.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.38-rc6/lib/Kconfig
-===================================================================
---- linux-2.6.38-rc6.orig/lib/Kconfig  2011-03-01 19:24:16.246703947 +0100
-+++ linux-2.6.38-rc6/lib/Kconfig       2011-03-01 19:26:58.696312483 +0100
+--- a/lib/Kconfig
++++ b/lib/Kconfig
 @@ -223,6 +223,13 @@ config LRU_CACHE
        tristate
  

diff --git a/target/linux/generic/patches-2.6.38/998-openwrt_lzma_options.patch b/target/linux/generic/patches-2.6.38/998-openwrt_lzma_options.patch
index 8819a633ac28fdec5562874be22d940f0be2d153..67e0ceefb080a691f510351682545c3673e51a0b 100644 (file)
--- a/target/linux/generic/patches-2.6.38/998-openwrt_lzma_options.patch
+++ b/target/linux/generic/patches-2.6.38/998-openwrt_lzma_options.patch
@@ -1,6 +1,6 @@
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
-@@ -254,7 +254,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
+@@ -254,7 +254,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 
  
  quiet_cmd_lzma = LZMA    $@
  cmd_lzma = (cat $(filter-out FORCE,$^) | \