refresh 2.6.30 patches

SVN-Revision: 29023

diff --git a/target/linux/generic-2.6/patches-2.6.30/014-cfi_fix_amd_extended_table_check.patch b/target/linux/generic-2.6/patches-2.6.30/014-cfi_fix_amd_extended_table_check.patch
index 3c7d303b7a473e02d28769a0085dced3eca087cd..1216a3bd3e6c59abe3c6f12f95ec4b521bef7c7b 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/014-cfi_fix_amd_extended_table_check.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/014-cfi_fix_amd_extended_table_check.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -336,6 +336,8 @@ static struct cfi_fixup fixup_table[] = 
+@@ -336,6 +336,8 @@ static struct cfi_fixup fixup_table[] =
  static void cfi_fixup_major_minor(struct cfi_private *cfi,
                                  struct cfi_pri_amdstd *extp)
  {
@@ -9,7 +9,7 @@
        if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
            extp->MajorVersion == '0')
                extp->MajorVersion = '1';
-@@ -366,6 +368,9 @@ struct mtd_info *cfi_cmdset_0002(struct 
+@@ -366,6 +368,9 @@ struct mtd_info *cfi_cmdset_0002(struct
        mtd->name    = map->name;
        mtd->writesize = 1;
  
@@ -19,7 +19,7 @@
        if (cfi->cfi_mode==CFI_MODE_CFI){
                unsigned char bootloc;
                /*
-@@ -384,16 +389,24 @@ struct mtd_info *cfi_cmdset_0002(struct 
+@@ -384,16 +389,24 @@ struct mtd_info *cfi_cmdset_0002(struct
  
                cfi_fixup_major_minor(cfi, extp);
  

diff --git a/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch
index caabacc3353d6fe883a04d05ec1580ca85dce4f0..6ff7504dd30bb78b9db9b91295eb4482caf98a39 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch
@@ -157,7 +157,7 @@
  
  unsigned int vced_count, vcei_count;
  
-@@ -33,8 +34,12 @@ static int show_cpuinfo(struct seq_file 
+@@ -33,8 +34,12 @@ static int show_cpuinfo(struct seq_file
        /*
         * For the first processor also print the system type
         */

diff --git a/target/linux/generic-2.6/patches-2.6.30/100-netfilter_layer7_2.21.patch b/target/linux/generic-2.6/patches-2.6.30/100-netfilter_layer7_2.21.patch
index 8100b1285c4015ed97d1720efc0f98cf705827b1..3791642d728cbd4180b8c8c275e266499a0a36b1 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/100-netfilter_layer7_2.21.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/100-netfilter_layer7_2.21.patch
@@ -71,7 +71,7 @@
        depends on NETFILTER_ADVANCED
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
-@@ -88,6 +88,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
+@@ -88,6 +88,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-2.6/patches-2.6.30/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.30/110-netfilter_match_speedup.patch
index 926966ced01ce381a1b31200956bf8c7e8ef5c29..e75d7aaee405dd5b93dd7bd58ca061a10f80aee8 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/110-netfilter_match_speedup.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/110-netfilter_match_speedup.patch
@@ -127,10 +127,11 @@
  
                e = (struct ipt_entry *)(loc_cpu_entry + off);
                if (copy_to_user(userptr + off
-@@ -986,6 +1026,14 @@ copy_entries_to_user(unsigned int total_
+@@ -985,6 +1025,14 @@ copy_entries_to_user(unsigned int total_
+                       ret = -EFAULT;
                        goto free_counters;
                }
- 
++
 +              flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
 +              if (copy_to_user(userptr + off
 +                               + offsetof(struct ipt_entry, ip.flags),
@@ -138,7 +139,6 @@
 +                      ret = -EFAULT;
 +                      goto free_counters;
 +              }
-+
+ 
                for (i = sizeof(struct ipt_entry);
                     i < e->target_offset;
-                    i += m->u.match_size) {

diff --git a/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch
index 3bd7a8fbb619511b8eb9231b4fb26da0202d726a..b4f2f4b5612471cba8e1c56cc95d169e4316d45f 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch
@@ -798,7 +798,7 @@
  
  #ifdef CONFIG_NET_DMA
        dma_cookie_t            dma_cookie;
-@@ -423,6 +435,12 @@ extern void skb_dma_unmap(struct device 
+@@ -423,6 +435,12 @@ extern void skb_dma_unmap(struct device
                          enum dma_data_direction dir);
  #endif
  
@@ -847,7 +847,7 @@
                        dev_queue_xmit_nit(skb, dev);
  
                if (netif_needs_gso(dev, skb)) {
-@@ -1749,8 +1756,7 @@ u16 skb_tx_hash(const struct net_device 
+@@ -1749,8 +1756,7 @@ u16 skb_tx_hash(const struct net_device
  }
  EXPORT_SYMBOL(skb_tx_hash);
  
@@ -1107,7 +1107,7 @@
  /* return EBUSY when somebody else is registered, return EEXIST if the
   * same handler is registered, return 0 in case of success. */
  int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
-@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const 
+@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const
  }
  EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
  

diff --git a/target/linux/generic-2.6/patches-2.6.30/202-mips_mem_functions_performance.patch b/target/linux/generic-2.6/patches-2.6.30/202-mips_mem_functions_performance.patch
index 6ea9ba51ee0d24cf3a3ac657278109d9b11de859..e4324717b4459ce1f1009053e6317c930b01b6e4 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/202-mips_mem_functions_performance.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/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-2.6/patches-2.6.30/203-slab_maxsize.patch b/target/linux/generic-2.6/patches-2.6.30/203-slab_maxsize.patch
index 25567f8488254180ab769774493be6d5635482a2..e3aa724a1a2e8b04da95054f5b3713f695ccfe51 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/203-slab_maxsize.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/203-slab_maxsize.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/slab.h
 +++ b/include/linux/slab.h
-@@ -115,8 +115,8 @@ int kmem_ptr_validate(struct kmem_cache 
+@@ -115,8 +115,8 @@ int kmem_ptr_validate(struct kmem_cache
   * to do various tricks to work around compiler limitations in order to
   * ensure proper constant folding.
   */

diff --git a/target/linux/generic-2.6/patches-2.6.30/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.30/210-mini_fo_2.6.25_fixes.patch
index d71e3b6faa6644c2337588f4b344cc5677419841..b64630d50045480d022ba26c901cea68f6da66b3 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/210-mini_fo_2.6.25_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/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-2.6/patches-2.6.30/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic-2.6/patches-2.6.30/212-mini_fo_2.6.26_fixes.patch
index 8bd9ba32447e15df6ebc7153edfe89dfd38f43f6..b5fa64e6a19e7fff343aed59f4ddccfc34578d91 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/212-mini_fo_2.6.26_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/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-2.6/patches-2.6.30/260-extend_pfifo_fast.patch b/target/linux/generic-2.6/patches-2.6.30/260-extend_pfifo_fast.patch
index ad9e9badd3128ec35e96fda3a8367c299a747ce6..2ad7adfb8e6fa92ea2d012af9ef500c77e98b871 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/260-extend_pfifo_fast.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/260-extend_pfifo_fast.patch
@@ -85,7 +85,7 @@
  
        for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
                skb_queue_head_init(list + prio);
-@@ -453,9 +490,36 @@ static int pfifo_fast_init(struct Qdisc 
+@@ -453,9 +490,36 @@ static int pfifo_fast_init(struct Qdisc
        return 0;
  }
  

diff --git a/target/linux/generic-2.6/patches-2.6.30/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.30/400-ledtrig_morse.patch
index 2754ed6d7e356a316db4d0c25e7d518e67580f34..155144ee1c1a223fc911f529629c9c6c14ff543a 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/400-ledtrig_morse.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/400-ledtrig_morse.patch
@@ -11,7 +11,7 @@
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -38,3 +38,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += 
+@@ -38,3 +38,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-2.6/patches-2.6.30/402-ledtrig_netdev.patch b/target/linux/generic-2.6/patches-2.6.30/402-ledtrig_netdev.patch
index c41fecfeadea4ab380b51c1e048cd6328d7a3fc3..8e2e5e85db16af7b192c185d62e3cc5697bfdf5f 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/402-ledtrig_netdev.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/402-ledtrig_netdev.patch
@@ -14,7 +14,7 @@
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -39,3 +39,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += 
+@@ -39,3 +39,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-2.6/patches-2.6.30/511-yaffs-cvs-2009-04-24.patch b/target/linux/generic-2.6/patches-2.6.30/511-yaffs-cvs-2009-04-24.patch
index 5c70e79a058d050e90224ac0ef80dcb1180235ab..c334b17d0872a877f52cd9c0e4234ad118df7d09 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/511-yaffs-cvs-2009-04-24.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/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-2.6/patches-2.6.30/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.30/903-hostap_txpower.patch
index 197d0a1e32fd05739da7b25dfdeef4e7974ea146..e220b0b36e0183793dcec949ecabb90bf8ca2900 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/903-hostap_txpower.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/903-hostap_txpower.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/hostap/hostap_ap.c
 +++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2335,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t 
+@@ -2335,13 +2335,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-2.6/patches-2.6.30/910-hostap_tx_queue_len_fix.patch b/target/linux/generic-2.6/patches-2.6.30/910-hostap_tx_queue_len_fix.patch
index b421662d9cf1af86819d2dc4504b5d199f947d4b..cb7b04012aca9b8c780d2aa1d4ea7137a2819f48 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/910-hostap_tx_queue_len_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/910-hostap_tx_queue_len_fix.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/hostap/hostap_main.c
 +++ b/drivers/net/wireless/hostap/hostap_main.c
-@@ -875,15 +875,16 @@ void hostap_setup_dev(struct net_device 
+@@ -875,15 +875,16 @@ void hostap_setup_dev(struct net_device
  
        switch(type) {
        case HOSTAP_INTERFACE_AP:

diff --git a/target/linux/generic-2.6/patches-2.6.30/924-cs5535_gpio.patch b/target/linux/generic-2.6/patches-2.6.30/924-cs5535_gpio.patch
index 453affe583354eb32f822efe76a0f028f4e0675e..a36ea49933bf9622a24da88f6d0f383b3a16a7e8 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/924-cs5535_gpio.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/924-cs5535_gpio.patch
@@ -8,7 +8,7 @@
  #include <linux/ioport.h>
  #include <linux/pci.h>
  #include <linux/smp_lock.h>
-@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[] 
+@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[]
  MODULE_DEVICE_TABLE(pci, divil_pci);
  
  static struct cdev cs5535_gpio_cdev;

diff --git a/target/linux/generic-2.6/patches-2.6.30/930-kmsg_dump_backport.patch b/target/linux/generic-2.6/patches-2.6.30/930-kmsg_dump_backport.patch
index cdcf094d0cfda970e0ea0949642e32e28b9e6215..bcf3506c3b2347750d1ed366a92b7971c0ac3ade 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/930-kmsg_dump_backport.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/930-kmsg_dump_backport.patch
@@ -55,7 +55,7 @@
  #include <linux/kallsyms.h>
  #include <linux/notifier.h>
  #include <linux/module.h>
-@@ -74,6 +75,7 @@ NORET_TYPE void panic(const char * fmt, 
+@@ -74,6 +75,7 @@ NORET_TYPE void panic(const char * fmt,
        dump_stack();
  #endif
  

diff --git a/target/linux/generic-2.6/patches-2.6.30/941-ssb_update.patch b/target/linux/generic-2.6/patches-2.6.30/941-ssb_update.patch
index 391fbba876142ff83968db98cf8a78bde23e34b0..42ee93b1afb5e8bead6aa16d330c56a27487aba2 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/941-ssb_update.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/941-ssb_update.patch
@@ -1,6 +1,6 @@
 --- a/drivers/ssb/driver_chipcommon_pmu.c
 +++ b/drivers/ssb/driver_chipcommon_pmu.c
-@@ -28,6 +28,21 @@ static void ssb_chipco_pll_write(struct 
+@@ -28,6 +28,21 @@ static void ssb_chipco_pll_write(struct
        chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, value);
  }
  
@@ -43,7 +43,7 @@
                /* We keep the default settings:
                 * min_msk = 0xCBB
                 * max_msk = 0x7FFFF
-@@ -506,3 +528,82 @@ void ssb_pmu_init(struct ssb_chipcommon 
+@@ -506,3 +528,82 @@ void ssb_pmu_init(struct ssb_chipcommon
        ssb_pmu_pll_init(cc);
        ssb_pmu_resources_init(cc);
  }
@@ -342,7 +342,7 @@
  
  static inline u8 ssb_crc8(u8 crc, u8 data)
  {
-@@ -247,7 +253,7 @@ static int sprom_do_read(struct ssb_bus 
+@@ -247,7 +253,7 @@ static int sprom_do_read(struct ssb_bus
        int i;
  
        for (i = 0; i < bus->sprom_size; i++)
@@ -432,7 +432,7 @@
  
        /* Extract the antenna gain values. */
        SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
-@@ -549,6 +600,7 @@ static int sprom_extract(struct ssb_bus 
+@@ -549,6 +600,7 @@ static int sprom_extract(struct ssb_bus
                        ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
                                   "  revision %d detected. Will extract"
                                   " v1\n", out->revision);
@@ -1345,7 +1345,7 @@
        }
        bus->mmio = NULL;
        bus->mapped_device = NULL;
-@@ -230,6 +240,8 @@ static void __iomem *ssb_ioremap(struct 
+@@ -230,6 +240,8 @@ static void __iomem *ssb_ioremap(struct
                SSB_BUG_ON(1); /* Can't reach this code. */
  #endif
                break;

diff --git a/target/linux/generic-2.6/patches-2.6.30/943-ssb_commit_settings_export.patch b/target/linux/generic-2.6/patches-2.6.30/943-ssb_commit_settings_export.patch
index 2bd551233c7d7ec3b118a2fe1827724e696ba60e..772680959de3c14ed00ec1c267bff70f952d2ca8 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/943-ssb_commit_settings_export.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/943-ssb_commit_settings_export.patch
@@ -1,6 +1,6 @@
 --- a/drivers/ssb/driver_pcicore.c
 +++ b/drivers/ssb/driver_pcicore.c
-@@ -476,30 +476,6 @@ static void ssb_pcie_mdio_write(struct s
+@@ -505,30 +505,6 @@ static void ssb_pcie_mdio_write(struct s
        pcicore_write32(pc, mdio_control, 0);
  }
  
@@ -33,7 +33,7 @@
  {
 --- a/drivers/ssb/main.c
 +++ b/drivers/ssb/main.c
-@@ -1406,6 +1406,31 @@ error:
+@@ -1301,6 +1301,31 @@ error:
  }
  EXPORT_SYMBOL(ssb_bus_powerup);
  
@@ -67,7 +67,7 @@
        u32 base = 0;
 --- a/include/linux/ssb/ssb.h
 +++ b/include/linux/ssb/ssb.h
-@@ -675,6 +675,7 @@ extern int ssb_bus_may_powerdown(struct 
+@@ -671,6 +671,7 @@ extern int ssb_bus_may_powerdown(struct
   * Otherwise static always-on powercontrol will be used. */
  extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);
  

diff --git a/target/linux/generic-2.6/patches-2.6.30/965-arm_restore_sigmask_v2.patch b/target/linux/generic-2.6/patches-2.6.30/965-arm_restore_sigmask_v2.patch
index 30acd0316bec2eaf1c471b5b87b2f11f4dc5c69b..c8f0bf5c8e9e4e7b2d515fc8832ec1aa8d81ca7e 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/965-arm_restore_sigmask_v2.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/965-arm_restore_sigmask_v2.patch
@@ -261,7 +261,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  handle_signal(unsigned long sig, struct k_sigaction *ka,
              siginfo_t *info, sigset_t *oldset,
              struct pt_regs * regs, int syscall)
-@@ -592,7 +557,7 @@ handle_signal(unsigned long sig, struct 
+@@ -592,7 +557,7 @@ handle_signal(unsigned long sig, struct
  
        if (ret != 0) {
                force_sigsegv(sig, tsk);
@@ -270,7 +270,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
        }
  
        /*
-@@ -606,6 +571,7 @@ handle_signal(unsigned long sig, struct 
+@@ -606,6 +571,7 @@ handle_signal(unsigned long sig, struct
        recalc_sigpending();
        spin_unlock_irq(&tsk->sighand->siglock);
  
@@ -278,7 +278,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  }
  
  /*
-@@ -617,11 +583,12 @@ handle_signal(unsigned long sig, struct 
+@@ -617,11 +583,12 @@ handle_signal(unsigned long sig, struct
   * the kernel can handle, and then we build all the user-level signal handling
   * stack-frames in one go after that.
   */

diff --git a/target/linux/generic-2.6/patches-2.6.30/971-ocf_20080917.patch b/target/linux/generic-2.6/patches-2.6.30/971-ocf_20080917.patch
index 869323fdb40b7ff295ad01348b3f6d214e0a8c9b..1d3f6855f18ad23e8972a7da13a1505f64e758b6 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/971-ocf_20080917.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/971-ocf_20080917.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.
-@@ -712,6 +722,61 @@ void add_disk_randomness(struct gendisk 
+@@ -712,6 +722,61 @@ void add_disk_randomness(struct gendisk
  }
  #endif
  

diff --git a/target/linux/generic-2.6/patches-2.6.30/990-fix_feroceon_vfp_handling.patch b/target/linux/generic-2.6/patches-2.6.30/990-fix_feroceon_vfp_handling.patch
index 0ee18f02b1153a82be8cd4f4cbddae803cab1a9a..8d986d484abaedc1115220ec236c1f51a3cd742d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/990-fix_feroceon_vfp_handling.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/990-fix_feroceon_vfp_handling.patch
@@ -53,7 +53,7 @@ Cc: Nicolas Pitre <nico@cam.org>
  check_for_exception:
 --- a/arch/arm/vfp/vfpmodule.c
 +++ b/arch/arm/vfp/vfpmodule.c
-@@ -253,12 +253,14 @@ void VFP_bounce(u32 trigger, u32 fpexc, 
+@@ -253,12 +253,14 @@ void VFP_bounce(u32 trigger, u32 fpexc,
        }
  
        if (fpexc & FPEXC_EX) {