projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ecb1a89
)
[kernel] refresh 2.6.35 patches
author
Florian Fainelli
<florian@openwrt.org>
Sun, 12 Sep 2010 21:23:15 +0000
(21:23 +0000)
committer
Florian Fainelli
<florian@openwrt.org>
Sun, 12 Sep 2010 21:23:15 +0000
(21:23 +0000)
SVN-Revision: 23033
20 files changed:
target/linux/generic/patches-2.6.35/014-cfi_fix_amd_extended_table_check.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/020-mips_multi_machine_support.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/065-rootfs_split.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/100-netfilter_layer7_2.21.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/202-mips_mem_functions_performance.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/203-slab_maxsize.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/210-mini_fo_2.6.25_fixes.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/212-mini_fo_2.6.26_fixes.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/223-kobject-add-broadcast_uevent.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/400-ledtrig_morse.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/402-ledtrig_netdev.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/511-yaffs-cvs-2009-04-24.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/903-hostap_txpower.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/924-cs5535_gpio.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/971-ocf_20100325.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/975-ssb_update.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/980-vm_exports.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.35/998-openwrt_lzma_options.patch
patch
|
blob
|
history
diff --git
a/target/linux/generic/patches-2.6.35/014-cfi_fix_amd_extended_table_check.patch
b/target/linux/generic/patches-2.6.35/014-cfi_fix_amd_extended_table_check.patch
index 1b028edd982c75a709e8273d4f5646f52b0943d3..cd4da2c2ad7acf37ac269ead841d2ff65ea97bb4 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/014-cfi_fix_amd_extended_table_check.patch
+++ b/
target/linux/generic/patches-2.6.35/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
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -372,6 +372,8 @@ static struct cfi_fixup fixup_table[] =
+@@ -372,6 +372,8 @@ static struct cfi_fixup fixup_table[] =
static void cfi_fixup_major_minor(struct cfi_private *cfi,
struct cfi_pri_amdstd *extp)
{
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';
if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
extp->MajorVersion == '0')
extp->MajorVersion = '1';
-@@ -404,6 +406,9 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -404,6 +406,9 @@ struct mtd_info *cfi_cmdset_0002(struct
mtd->reboot_notifier.notifier_call = cfi_amdstd_reboot;
mtd->reboot_notifier.notifier_call = cfi_amdstd_reboot;
@@
-19,7
+19,7
@@
if (cfi->cfi_mode==CFI_MODE_CFI){
unsigned char bootloc;
__u16 adr = primary?cfi->cfiq->P_ADR:cfi->cfiq->A_ADR;
if (cfi->cfi_mode==CFI_MODE_CFI){
unsigned char bootloc;
__u16 adr = primary?cfi->cfiq->P_ADR:cfi->cfiq->A_ADR;
-@@ -417,16 +422,24 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -417,16 +422,24 @@ struct mtd_info *cfi_cmdset_0002(struct
*/
cfi_fixup_major_minor(cfi, extp);
*/
cfi_fixup_major_minor(cfi, extp);
diff --git
a/target/linux/generic/patches-2.6.35/020-mips_multi_machine_support.patch
b/target/linux/generic/patches-2.6.35/020-mips_multi_machine_support.patch
index ca0c10b20dbbcf35f71f402f8b4b219f167a3ea7..83e24451c1c952088afd9c4e91b2c65f8707b27e 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/020-mips_multi_machine_support.patch
+++ b/
target/linux/generic/patches-2.6.35/020-mips_multi_machine_support.patch
@@
-176,7
+176,7
@@
unsigned int vced_count, vcei_count;
unsigned int vced_count, vcei_count;
-@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file
+@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file
/*
* For the first processor also print the system type
*/
/*
* For the first processor also print the system type
*/
diff --git
a/target/linux/generic/patches-2.6.35/065-rootfs_split.patch
b/target/linux/generic/patches-2.6.35/065-rootfs_split.patch
index a6766de466dbcb55015139922d78b33ed2b9acc3..ed23fbbc1f3c4c81fec93c4ff7c71535798b2fc1 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/065-rootfs_split.patch
+++ b/
target/linux/generic/patches-2.6.35/065-rootfs_split.patch
@@
-554,7
+554,7
@@
#include <asm/uaccess.h>
#include <asm/uaccess.h>
-@@ -826,6 +827,13 @@ static int mtd_ioctl(struct file *file,
+@@ -826,6 +827,13 @@ static int mtd_ioctl(struct file *file,
file->f_pos = 0;
break;
}
file->f_pos = 0;
break;
}
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 f242fce377cfec1c627c1d4ee5ba94419e7805a2..99b43886611f3f6fe425f43ca1b7cdbcebbf419b 100644
(file)
--- 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
@@
-15,7
+15,7
@@
void *priv;
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
void *priv;
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
-@@ -9
1,7 +91
,18 @@ static int __devinit plat_nand_probe(str
+@@ -9
6,7 +96
,18 @@ static int __devinit plat_nand_probe(str
}
/* Scan to find existance of the device */
}
/* Scan to find existance of the device */
diff --git
a/target/linux/generic/patches-2.6.35/100-netfilter_layer7_2.21.patch
b/target/linux/generic/patches-2.6.35/100-netfilter_layer7_2.21.patch
index fa1274c3b9de5d2936a83f35baf6b28130d9d4fa..39ff04ad958d7446777b41c0adaa807c8b785422 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/100-netfilter_layer7_2.21.patch
+++ b/
target/linux/generic/patches-2.6.35/100-netfilter_layer7_2.21.patch
@@
-71,7
+71,7
@@
depends on NETFILTER_ADVANCED
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
depends on NETFILTER_ADVANCED
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
-@@ -91,6 +91,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
+@@ -91,6 +91,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
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.35/110-netfilter_match_speedup.patch
b/target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch
index 7affbb1221bac8177e0e3c11ba098097688191a2..cd840cdc21f0baddc6064a3319e8093eaa49e73e 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch
+++ b/
target/linux/generic/patches-2.6.35/110-netfilter_match_speedup.patch
@@
-132,10
+132,11
@@
e = (struct ipt_entry *)(loc_cpu_entry + off);
if (copy_to_user(userptr + off
e = (struct ipt_entry *)(loc_cpu_entry + off);
if (copy_to_user(userptr + off
-@@ -980,6 +1021,14 @@ copy_entries_to_user(unsigned int total_
+@@ -979,6 +1020,14 @@ copy_entries_to_user(unsigned int total_
+ ret = -EFAULT;
goto free_counters;
}
goto free_counters;
}
-
++
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
+ if (copy_to_user(userptr + off
+ + offsetof(struct ipt_entry, ip.flags),
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
+ if (copy_to_user(userptr + off
+ + offsetof(struct ipt_entry, ip.flags),
@@
-143,7
+144,6
@@
+ ret = -EFAULT;
+ goto free_counters;
+ }
+ ret = -EFAULT;
+ goto free_counters;
+ }
-+
+
for (i = sizeof(struct ipt_entry);
i < e->target_offset;
for (i = sizeof(struct ipt_entry);
i < e->target_offset;
- i += m->u.match_size) {
diff --git
a/target/linux/generic/patches-2.6.35/202-mips_mem_functions_performance.patch
b/target/linux/generic/patches-2.6.35/202-mips_mem_functions_performance.patch
index 6ea9ba51ee0d24cf3a3ac657278109d9b11de859..e4324717b4459ce1f1009053e6317c930b01b6e4 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/202-mips_mem_functions_performance.patch
+++ b/
target/linux/generic/patches-2.6.35/202-mips_mem_functions_performance.patch
@@
-1,6
+1,6
@@
--- a/arch/mips/include/asm/string.h
+++ b/arch/mips/include/asm/string.h
--- 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);
#define __HAVE_ARCH_MEMSET
extern void *memset(void *__s, int __c, size_t __count);
diff --git
a/target/linux/generic/patches-2.6.35/203-slab_maxsize.patch
b/target/linux/generic/patches-2.6.35/203-slab_maxsize.patch
index 83fd6c309928d78bdbdc7db87abdd7b06383d9cd..fe8cecfc771ed7a1cd16d22361475b2151e8bb98 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/203-slab_maxsize.patch
+++ b/
target/linux/generic/patches-2.6.35/203-slab_maxsize.patch
@@
-1,6
+1,6
@@
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
-@@ -130,8 +130,8 @@ int kmem_ptr_validate(struct kmem_cache
+@@ -130,8 +130,8 @@ int kmem_ptr_validate(struct kmem_cache
* to do various tricks to work around compiler limitations in order to
* ensure proper constant folding.
*/
* to do various tricks to work around compiler limitations in order to
* ensure proper constant folding.
*/
diff --git
a/target/linux/generic/patches-2.6.35/210-mini_fo_2.6.25_fixes.patch
b/target/linux/generic/patches-2.6.35/210-mini_fo_2.6.25_fixes.patch
index d71e3b6faa6644c2337588f4b344cc5677419841..b64630d50045480d022ba26c901cea68f6da66b3 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/210-mini_fo_2.6.25_fixes.patch
+++ b/
target/linux/generic/patches-2.6.35/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);
#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__ */
#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
#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 */
err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
/* validate */
diff --git
a/target/linux/generic/patches-2.6.35/212-mini_fo_2.6.26_fixes.patch
b/target/linux/generic/patches-2.6.35/212-mini_fo_2.6.26_fixes.patch
index 8bd9ba32447e15df6ebc7153edfe89dfd38f43f6..b5fa64e6a19e7fff343aed59f4ddccfc34578d91 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/212-mini_fo_2.6.26_fixes.patch
+++ b/
target/linux/generic/patches-2.6.35/212-mini_fo_2.6.26_fixes.patch
@@
-1,6
+1,6
@@
--- a/fs/mini_fo/super.c
+++ b/fs/mini_fo/super.c
--- 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) */
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
diff --git
a/target/linux/generic/patches-2.6.35/223-kobject-add-broadcast_uevent.patch
b/target/linux/generic/patches-2.6.35/223-kobject-add-broadcast_uevent.patch
index c09e13e11c6247e31de2705c4261f869e96e23eb..14a36844105977b20891bcef7f2886b65371b467 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/223-kobject-add-broadcast_uevent.patch
+++ b/
target/linux/generic/patches-2.6.35/223-kobject-add-broadcast_uevent.patch
@@
-20,7
+20,7
@@
#else
static inline int kobject_uevent(struct kobject *kobj,
enum kobject_action action)
#else
static inline int kobject_uevent(struct kobject *kobj,
enum kobject_action action)
-@@ -262,6 +268,16 @@ static inline int add_uevent_var(struct
+@@ -262,6 +268,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; }
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.35/400-ledtrig_morse.patch
b/target/linux/generic/patches-2.6.35/400-ledtrig_morse.patch
index 9630940bfeebeb2d7d3eb31f4fd3abc57a0ef205..ef8017b95d5655fa2a6ba36f8fc1bd44dfd419cc 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/400-ledtrig_morse.patch
+++ b/
target/linux/generic/patches-2.6.35/400-ledtrig_morse.patch
@@
-11,7
+11,7
@@
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
-@@ -48,3 +48,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) +=
+@@ -48,3 +48,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
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.35/402-ledtrig_netdev.patch
b/target/linux/generic/patches-2.6.35/402-ledtrig_netdev.patch
index 16e5756cf16285cf23965e5ff53a17650ab4de50..4ee69aa85740d30c91b976a6d739133786efba79 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/402-ledtrig_netdev.patch
+++ b/
target/linux/generic/patches-2.6.35/402-ledtrig_netdev.patch
@@
-14,7
+14,7
@@
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
-@@ -49,3 +49,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) +=
+@@ -49,3 +49,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
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.35/511-yaffs-cvs-2009-04-24.patch
b/target/linux/generic/patches-2.6.35/511-yaffs-cvs-2009-04-24.patch
index 5c70e79a058d050e90224ac0ef80dcb1180235ab..c334b17d0872a877f52cd9c0e4234ad118df7d09 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/511-yaffs-cvs-2009-04-24.patch
+++ b/
target/linux/generic/patches-2.6.35/511-yaffs-cvs-2009-04-24.patch
@@
-601,7
+601,7
@@
dev->checkpointBlockList[i] = -1;
}
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)
{
static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
{
@@
-926,7
+926,7
@@
{
unsigned char cDelta; /* column parity delta */
unsigned lDelta; /* line parity delta */
{
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 &&
return 0; /* no error */
if (lDelta == ~lDeltaPrime &&
@@
-936,7
+936,7
@@
/* Single bit (recoverable) error in data */
bit = 0;
/* 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;
if (cDelta & 0x02)
bit |= 0x01;
@@
-945,7
+945,7
@@
return -1;
data[lDelta] ^= (1 << bit);
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) +
}
if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
@@
-954,7
+954,7
@@
/* Reccoverable error in ecc */
*read_ecc = *test_ecc;
/* 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;
/* Unrecoverable error */
return -1;
@@
-1398,7
+1398,7
@@
{
unsigned char *alias;
int ret;
{
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;
}
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)
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,
yaffs_Device *dev = obj->myDev;
T(YAFFS_TRACE_OS,
@@
-1571,7
+1571,7
@@
yaffs_GrossLock(dev);
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;
yaffs_Device *dev;
@@
-1591,7
+1591,7
@@
BUG_ON(!PageLocked(pg));
#else
if (!PageLocked(pg))
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);
yaffs_GrossLock(dev);
@@
-1604,7
+1604,7
@@
yaffs_GrossUnlock(dev);
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);
flush_dcache_page(pg);
kunmap(pg);
@@
-3193,7
+3193,7
@@
if (n < step) {
n++;
continue;
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;
char *end;
char *mask_name;
const char *x;
@@
-3202,7
+3202,7
@@
int i;
int done = 0;
int add, len = 0;
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;
while (!done && (pos < count)) {
done = 1;
@@
-3213,7
+3213,7
@@
switch (buf[pos]) {
case '+':
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);
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;
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;
if (mask_name != NULL) {
done = 0;
@@
-3249,7
+3249,7
@@
case '-':
rg &= ~mask_bitfield;
break;
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;
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);
{
/* 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;
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) {
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. */
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;
cache->locked = 1;
@@
-7673,7
+7673,7
@@
cache->locked = 0;
} else {
/* Read into the local buffer then copy..*/
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);
yaffs_GetTempBuffer(dev, __LINE__);
yaffs_ReadChunkDataFromObject(in, chunk,
localBuffer);
@@
-7718,7
+7718,7
@@
}
n -= nToCopy;
}
n -= nToCopy;
-@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object
return nDone;
}
return nDone;
}
@@
-7923,7
+7923,7
@@
int newFullChunks;
yaffs_Device *dev = in->myDev;
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);
yaffs_CheckGarbageCollection(dev);
@@
-7941,7
+7941,7
@@
if (newSize < oldFileSize) {
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);
{
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;
{
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;
dev->chunkOffset = 0;
dev->nFreeChunks = 0;
@@
-9798,7
+9798,7
@@
if (dev->startBlock == 0) {
dev->internalStartBlock = dev->startBlock + 1;
dev->internalEndBlock = dev->endBlock + 1;
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. */
/* Check geometry parameters. */
@@
-9823,7
+9823,7
@@
return YAFFS_FAIL;
}
return YAFFS_FAIL;
}
-@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device *
return YAFFS_FAIL;
}
return YAFFS_FAIL;
}
@@
-9836,7
+9836,7
@@
/* Got the right mix of functions? */
if (!yaffs_CheckDevFunctions(dev)) {
/* Function missing */
/* 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;
dev->isMounted = 1;
@@
-9875,7
+9875,7
@@
/*
* Calculate chunkGroupBits.
/*
* 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. */
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;
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. */
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;
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;
if (!init_failed &&
dev->nShortOpCaches > 0) {
int i;
@@
-9940,7
+9940,7
@@
init_failed = 1;
dev->srLastUse = 0;
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;
dev->cacheHits = 0;
@@
-9979,7
+9979,7
@@
T(YAFFS_TRACE_ALWAYS,
(TSTR("yaffs: restored from checkpoint" TENDSTR)));
} else {
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;
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)));
/* 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));
{
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,
* Returns YAFFS_OK or YAFFS_FAIL.
*/
int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
@@
-11038,14
+11038,14
@@
+ yaffs_UnpackTags2(tags, &pt);
+ }
+ }
+ 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 (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)
+ 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
if (retval == 0)
return YAFFS_OK;
else
diff --git
a/target/linux/generic/patches-2.6.35/903-hostap_txpower.patch
b/target/linux/generic/patches-2.6.35/903-hostap_txpower.patch
index 5c2d3825e05950670dc40b14566d96ce2ba04612..0fa81eb9e49d82df0354115a15a9b17e387a7afb 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/903-hostap_txpower.patch
+++ b/
target/linux/generic/patches-2.6.35/903-hostap_txpower.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2336,13 +2336,13 @@ int prism2_ap_get_sta_qual(local_info_t
+@@ -2336,13 +2336,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)
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.35/924-cs5535_gpio.patch
b/target/linux/generic/patches-2.6.35/924-cs5535_gpio.patch
index 4cb3031db5a239b39deaa2460b8367e9d12e4a51..9081be84a4e9bb047248c72c816a219e83efd598 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/924-cs5535_gpio.patch
+++ b/
target/linux/generic/patches-2.6.35/924-cs5535_gpio.patch
@@
-8,7
+8,7
@@
#include <linux/ioport.h>
#include <linux/pci.h>
#include <linux/ioport.h>
#include <linux/pci.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;
MODULE_DEVICE_TABLE(pci, divil_pci);
static struct cdev cs5535_gpio_cdev;
diff --git
a/target/linux/generic/patches-2.6.35/971-ocf_20100325.patch
b/target/linux/generic/patches-2.6.35/971-ocf_20100325.patch
index fe96d7937a22c0971b94bdead0f2bb999159a118..3b6b7d9a48e2ff0e8d7d1c5214559ae5afcd1096 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/971-ocf_20100325.patch
+++ b/
target/linux/generic/patches-2.6.35/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.
* 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
}
#endif
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 77f6bcff7f69aa2442a1c841b0c7e318806dcbe4..6cf41cc6a0809bfa111b79f280c0cc640e054fa9 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/975-ssb_update.patch
+++ b/
target/linux/generic/patches-2.6.35/975-ssb_update.patch
@@
-376,7
+376,7
@@
u32 pmucap;
if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU))
u32 pmucap;
if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU))
-@@ -516,15 +516,12 @@ void ssb_pmu_init(struct ssb_chipcommon
+@@ -516,15 +516,12 @@ void ssb_pmu_init(struct ssb_chipcommon
ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
cc->pmu.rev, pmucap);
ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
cc->pmu.rev, pmucap);
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 c372e9570365fd5f50593d7e02ac523ff2420fdb..73a221af87cf0ec81ed6e6072729877dab6af283 100644
(file)
--- 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
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -426
1,6 +4261
,7 @@ int can_nice(const struct task_struct *p
+@@ -426
9,6 +4269
,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
diff --git
a/target/linux/generic/patches-2.6.35/998-openwrt_lzma_options.patch
b/target/linux/generic/patches-2.6.35/998-openwrt_lzma_options.patch
index e63d733be9137f603390ecdf4ecd997c3f104047..77161f684d0fbf11bd95c43444fd7ff7d6716b99 100644
(file)
--- a/
target/linux/generic/patches-2.6.35/998-openwrt_lzma_options.patch
+++ b/
target/linux/generic/patches-2.6.35/998-openwrt_lzma_options.patch
@@
-1,6
+1,6
@@
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
-@@ -238,7 +238,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
+@@ -238,7 +238,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
quiet_cmd_lzma = LZMA $@
cmd_lzma = (cat $(filter-out FORCE,$^) | \
quiet_cmd_lzma = LZMA $@
cmd_lzma = (cat $(filter-out FORCE,$^) | \