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:
80384c4
)
[kernel] refresh 2.6.37 patches
author
Florian Fainelli
<florian@openwrt.org>
Fri, 20 May 2011 10:06:11 +0000
(10:06 +0000)
committer
Florian Fainelli
<florian@openwrt.org>
Fri, 20 May 2011 10:06:11 +0000
(10:06 +0000)
SVN-Revision: 26955
26 files changed:
target/linux/generic/patches-2.6.37/020-ssb_update.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/021-ssb_commit_settings_export.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/030-mips_multi_machine_support.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/110_fix_ecn_marking_ipv6.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/230-openwrt_lzma_options.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/306-mips_mem_functions_performance.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/311-arm_update_mach_types.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/400-rootfs_split.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/460-cfi_show_amd_extended_table_version.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/473-mtd_samsung_flash.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/501-yaffs_cvs_2009_04_24.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/502-yaffs_git_2010_10_20.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/511-debloat_lzma.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/600-netfilter_layer7_2.22.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/722-phy_mvswitch.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/723-phy_ip175c.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/724-phy_ar8216.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/725-phy_rtl8306.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/726-phy_rtl8366.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/750-hostap_txpower.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/830-ledtrig_morse.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/831-ledtrig_netdev.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/834-gpio_ioctl.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/900-slab_maxsize.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/911-kobject_add_broadcast_uevent.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.37/941-ocf_20100325.patch
patch
|
blob
|
history
diff --git
a/target/linux/generic/patches-2.6.37/020-ssb_update.patch
b/target/linux/generic/patches-2.6.37/020-ssb_update.patch
index 718b00542644277c4b4ef13b7b7e19669c04d8e8..ff33a38433e27cec82f127e55a9b0e077e10989b 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/020-ssb_update.patch
+++ b/
target/linux/generic/patches-2.6.37/020-ssb_update.patch
@@
-197,7
+197,7
@@
/* TODO - get remaining rev 8 stuff needed */
}
/* TODO - get remaining rev 8 stuff needed */
}
-@@ -573,37 +621,34 @@ static int sprom_extract(struct ssb_bus
+@@ -573,37 +621,34 @@ static int sprom_extract(struct ssb_bus
ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
memset(out->et0mac, 0xFF, 6); /* preset et0 and et1 mac */
memset(out->et1mac, 0xFF, 6);
ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
memset(out->et0mac, 0xFF, 6); /* preset et0 and et1 mac */
memset(out->et1mac, 0xFF, 6);
diff --git
a/target/linux/generic/patches-2.6.37/021-ssb_commit_settings_export.patch
b/target/linux/generic/patches-2.6.37/021-ssb_commit_settings_export.patch
index a0086ec9d0e2707f5a9bb991f59bb5251c0c8716..657fdd6b925fe54c3290b04f553f4820c42759db 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/021-ssb_commit_settings_export.patch
+++ b/
target/linux/generic/patches-2.6.37/021-ssb_commit_settings_export.patch
@@
-67,7
+67,7
@@
u32 base = 0;
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
u32 base = 0;
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
-@@ -518,6 +518,7 @@ extern int ssb_bus_may_powerdown(struct
+@@ -518,6 +518,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);
* 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/patches-2.6.37/030-mips_multi_machine_support.patch
b/target/linux/generic/patches-2.6.37/030-mips_multi_machine_support.patch
index ab270ff97cbccec1883a5678e0c4a84c0aaea32b..729934f283fbe01028e2921157b235cbcfdd1e7a 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/030-mips_multi_machine_support.patch
+++ b/
target/linux/generic/patches-2.6.37/030-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.37/110_fix_ecn_marking_ipv6.patch
b/target/linux/generic/patches-2.6.37/110_fix_ecn_marking_ipv6.patch
index 442e5e3c321cd557ba1d908c53fc8b61032556aa..a981884b1ba9d666de40f97c307e9cf1ac23501f 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/110_fix_ecn_marking_ipv6.patch
+++ b/
target/linux/generic/patches-2.6.37/110_fix_ecn_marking_ipv6.patch
@@
-1,6
+1,6
@@
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
-@@ -38,9 +38,19 @@ static inline __u8 INET_ECN_encapsulate(
__u8 outer, __u8 inner)
+@@ -38,9 +38,19 @@ static inline __u8 INET_ECN_encapsulate(
return outer;
}
return outer;
}
diff --git
a/target/linux/generic/patches-2.6.37/230-openwrt_lzma_options.patch
b/target/linux/generic/patches-2.6.37/230-openwrt_lzma_options.patch
index c1a70f007ffd6cada935514f1c572d4d5982dc5b..c4cc05857ddd37a232ba43917d5254c7d84b7fc4 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/230-openwrt_lzma_options.patch
+++ b/
target/linux/generic/patches-2.6.37/230-openwrt_lzma_options.patch
@@
-1,6
+1,6
@@
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
-@@ -231,7 +231,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
+@@ -231,7 +231,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,$^) | \
diff --git
a/target/linux/generic/patches-2.6.37/306-mips_mem_functions_performance.patch
b/target/linux/generic/patches-2.6.37/306-mips_mem_functions_performance.patch
index 6ea9ba51ee0d24cf3a3ac657278109d9b11de859..e4324717b4459ce1f1009053e6317c930b01b6e4 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/306-mips_mem_functions_performance.patch
+++ b/
target/linux/generic/patches-2.6.37/306-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.37/311-arm_update_mach_types.patch
b/target/linux/generic/patches-2.6.37/311-arm_update_mach_types.patch
index 1223fb456d6e66e20c51a8b40a8758da430fc0cc..835f25a17915225cc6a40c343fdb8a6e6e2a51af 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/311-arm_update_mach_types.patch
+++ b/
target/linux/generic/patches-2.6.37/311-arm_update_mach_types.patch
@@
-63,7
+63,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
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 +2446,7 @@ siogentoo1 MACH_SIOGENTOO1 SIOGENTOO1
+@@ -2446,7 +2446,7 @@ 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
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.37/400-rootfs_split.patch
b/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
index 1f61bfdd36f114975d311232924b8ee1577d5ce4..00210c09576bca33471793ed2b3d817cfe2c4bf5 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/400-rootfs_split.patch
+++ b/
target/linux/generic/patches-2.6.37/400-rootfs_split.patch
@@
-193,7
+193,7
@@
/*
* This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to
/*
* This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to
-@@ -633,7 +78
2
,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -633,7 +78
4
,7 @@ int add_mtd_partitions(struct mtd_info *
{
struct mtd_part *slave;
uint64_t cur_offset = 0;
{
struct mtd_part *slave;
uint64_t cur_offset = 0;
@@
-202,7
+202,7
@@
printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
-@@ -648,6 +79
7
,21 @@ int add_mtd_partitions(struct mtd_info *
+@@ -648,6 +79
9
,21 @@ int add_mtd_partitions(struct mtd_info *
add_mtd_device(&slave->mtd);
add_mtd_device(&slave->mtd);
@@
-224,7
+224,7
@@
cur_offset = slave->offset + slave->mtd.size;
}
cur_offset = slave->offset + slave->mtd.size;
}
-@@ -655,6 +8
19
,32 @@ int add_mtd_partitions(struct mtd_info *
+@@ -655,6 +8
21
,32 @@ int add_mtd_partitions(struct mtd_info *
}
EXPORT_SYMBOL(add_mtd_partitions);
}
EXPORT_SYMBOL(add_mtd_partitions);
@@
-259,7
+259,7
@@
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
--- 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;
}
file->f_pos = 0;
break;
}
diff --git
a/target/linux/generic/patches-2.6.37/460-cfi_show_amd_extended_table_version.patch
b/target/linux/generic/patches-2.6.37/460-cfi_show_amd_extended_table_version.patch
index e1981ddd25718b7c8bef0238361e5b2a2179db3a..38ba76df4616b55cbb296f59b108771370fa837f 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/460-cfi_show_amd_extended_table_version.patch
+++ b/
target/linux/generic/patches-2.6.37/460-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
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -446,9 +446,9 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -446,9 +446,9 @@ struct mtd_info *cfi_cmdset_0002(struct
/*
* Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4
/*
* Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4
diff --git
a/target/linux/generic/patches-2.6.37/473-mtd_samsung_flash.patch
b/target/linux/generic/patches-2.6.37/473-mtd_samsung_flash.patch
index 9b8cc815a845b854f657aa0b3d8797d0eb7f63f5..cb9f7bfaca920368df9f974671780d0df403cd4b 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/473-mtd_samsung_flash.patch
+++ b/
target/linux/generic/patches-2.6.37/473-mtd_samsung_flash.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
-@@ -392,9 +392,35 @@ static struct cfi_fixup fixup_table[] =
+@@ -392,9 +392,35 @@ 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)
{
diff --git
a/target/linux/generic/patches-2.6.37/501-yaffs_cvs_2009_04_24.patch
b/target/linux/generic/patches-2.6.37/501-yaffs_cvs_2009_04_24.patch
index 5c70e79a058d050e90224ac0ef80dcb1180235ab..c334b17d0872a877f52cd9c0e4234ad118df7d09 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/501-yaffs_cvs_2009_04_24.patch
+++ b/
target/linux/generic/patches-2.6.37/501-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.37/502-yaffs_git_2010_10_20.patch
b/target/linux/generic/patches-2.6.37/502-yaffs_git_2010_10_20.patch
index a2f35bf4efafef3189ba899aaece9e04094c11c3..3260d1c4175a12c916e1b1a69c7f4a687c940014 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/502-yaffs_git_2010_10_20.patch
+++ b/
target/linux/generic/patches-2.6.37/502-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
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 */
MTD versions in yaffs_mtdif1.c.
*/
/* Default: Not selected */
@@
-1614,7
+1614,7
@@
yaffs_ECCOther *read_ecc,
const yaffs_ECCOther *test_ecc)
{
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;
if (cDelta & 0x02)
bit |= 0x01;
@@
-1623,7
+1623,7
@@
return -1;
data[lDelta] ^= (1 << bit);
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 */
}
return 1; /* corrected */
}
diff --git
a/target/linux/generic/patches-2.6.37/511-debloat_lzma.patch
b/target/linux/generic/patches-2.6.37/511-debloat_lzma.patch
index 18e4a51ee35b7226321708364bfa5466ab5c38cd..1e41661ebb60fdbfa7e0ba613e236e4e0d94405a 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/511-debloat_lzma.patch
+++ b/
target/linux/generic/patches-2.6.37/511-debloat_lzma.patch
@@
-124,7
+124,7
@@
/* LzmaDecode
--- a/lib/lzma/LzmaDec.c
+++ b/lib/lzma/LzmaDec.c
/* 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;
}
p->needFlush = 0;
}
@@
-194,7
+194,7
@@
{
CLzmaProps propNew;
RINOK(LzmaProps_Decode(&propNew, props, propsSize));
{
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;
}
return SZ_OK;
}
@@
-375,7
+375,7
@@
void MatchFinder_Construct(CMatchFinder *p);
/* Conditions:
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);
UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
ISzAlloc *alloc);
void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
diff --git
a/target/linux/generic/patches-2.6.37/600-netfilter_layer7_2.22.patch
b/target/linux/generic/patches-2.6.37/600-netfilter_layer7_2.22.patch
index b47f05c4c71bb6cdc19ce05883efb0c2449ac7be..8a66cab18ef9e05bc7bc957e7f51262e637dd225 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/600-netfilter_layer7_2.22.patch
+++ b/
target/linux/generic/patches-2.6.37/600-netfilter_layer7_2.22.patch
@@
-30,7
+30,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
-@@ -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
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.37/722-phy_mvswitch.patch
b/target/linux/generic/patches-2.6.37/722-phy_mvswitch.patch
index 00950dc637ef7bdc1cab95028638bb32fb12049f..2025b229a4c4eccc85d9c69af4a8936c3592c325 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/722-phy_mvswitch.patch
+++ b/
target/linux/generic/patches-2.6.37/722-phy_mvswitch.patch
@@
-1,8
+1,8
@@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -10
3,6 +103
,9 @@ config ADM6996_PHY
- ---help---
- Currently supports the ADM6996F switch
+@@ -10
5,6 +105
,9 @@ config ADM6996_PHY
+ Currently supports the ADM6996FC and ADM6996M switches.
+ Support for FC is very limited.
+config MVSWITCH_PHY
+ tristate "Driver for Marvell 88E6060 switches"
+config MVSWITCH_PHY
+ tristate "Driver for Marvell 88E6060 switches"
diff --git
a/target/linux/generic/patches-2.6.37/723-phy_ip175c.patch
b/target/linux/generic/patches-2.6.37/723-phy_ip175c.patch
index 0af080bc9b43bee8acfba52d96389ad26eeb2c36..9e13e579dd39142f0c9a037a5f30fca8c8268ab7 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/723-phy_ip175c.patch
+++ b/
target/linux/generic/patches-2.6.37/723-phy_ip175c.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -10
6,6 +106
,10 @@ config ADM6996_PHY
+@@ -10
8,6 +108
,10 @@ config ADM6996_PHY
config MVSWITCH_PHY
tristate "Driver for Marvell 88E6060 switches"
config MVSWITCH_PHY
tristate "Driver for Marvell 88E6060 switches"
diff --git
a/target/linux/generic/patches-2.6.37/724-phy_ar8216.patch
b/target/linux/generic/patches-2.6.37/724-phy_ar8216.patch
index e532b3cca99491abf9aecc2a4ba52291ea8105dc..a718e370f10800e70bbdf8339576e8bda2ddcbec 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/724-phy_ar8216.patch
+++ b/
target/linux/generic/patches-2.6.37/724-phy_ar8216.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -11
0,6 +110
,10 @@ config IP17XX_PHY
+@@ -11
2,6 +112
,10 @@ config IP17XX_PHY
tristate "Driver for IC+ IP17xx switches"
select SWCONFIG
tristate "Driver for IC+ IP17xx switches"
select SWCONFIG
diff --git
a/target/linux/generic/patches-2.6.37/725-phy_rtl8306.patch
b/target/linux/generic/patches-2.6.37/725-phy_rtl8306.patch
index 5a527b1863d2d294ef806a6e2f44c58dc8869907..a6d188f2ce77c3866d3787941638058822137b6e 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/725-phy_rtl8306.patch
+++ b/
target/linux/generic/patches-2.6.37/725-phy_rtl8306.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -11
4,6 +114
,10 @@ config AR8216_PHY
+@@ -11
6,6 +116
,10 @@ config AR8216_PHY
tristate "Driver for Atheros AR8216 switches"
select SWCONFIG
tristate "Driver for Atheros AR8216 switches"
select SWCONFIG
diff --git
a/target/linux/generic/patches-2.6.37/726-phy_rtl8366.patch
b/target/linux/generic/patches-2.6.37/726-phy_rtl8366.patch
index fdfeb54335117d525eabf87cefed0e4acc94b236..badc0a4e62cdfe1a4f62784be145c793c4e1378d 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/726-phy_rtl8366.patch
+++ b/
target/linux/generic/patches-2.6.37/726-phy_rtl8366.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -15
6,4 +156
,29 @@ config MDIO_OCTEON
+@@ -15
8,4 +158
,29 @@ config MDIO_OCTEON
If in doubt, say Y.
If in doubt, say Y.
diff --git
a/target/linux/generic/patches-2.6.37/750-hostap_txpower.patch
b/target/linux/generic/patches-2.6.37/750-hostap_txpower.patch
index ad44715411263c97fc2b187c8fffd5e1dba7adae..e40053170c89c6f7569699eff156072b022a8721 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/750-hostap_txpower.patch
+++ b/
target/linux/generic/patches-2.6.37/750-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
-@@ -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)
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.37/830-ledtrig_morse.patch
b/target/linux/generic/patches-2.6.37/830-ledtrig_morse.patch
index 62a90a4591698bb871982438fc9871c6cbd97efb..8d901845564cc440a65994f6f8970b37fbdd3e2c 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/830-ledtrig_morse.patch
+++ b/
target/linux/generic/patches-2.6.37/830-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
-@@ -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
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.37/831-ledtrig_netdev.patch
b/target/linux/generic/patches-2.6.37/831-ledtrig_netdev.patch
index 5354aa187bab0c24efe9f1cadfa98a56f18a3b31..6406adac2a03d1c606b2129ffb3fbda2f355a9c8 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/831-ledtrig_netdev.patch
+++ b/
target/linux/generic/patches-2.6.37/831-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
-@@ -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
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.37/834-gpio_ioctl.patch
b/target/linux/generic/patches-2.6.37/834-gpio_ioctl.patch
index 6609a1670af5e5d3297b09bbc6baf6cc0c67880b..3b7063223ecda6601e050f7f19b8719af17b00dc 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/834-gpio_ioctl.patch
+++ b/
target/linux/generic/patches-2.6.37/834-gpio_ioctl.patch
@@
-1,6
+1,6
@@
--- a/drivers/char/gpio_dev.c
+++ b/drivers/char/gpio_dev.c
--- 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 = {
}
struct file_operations gpio_fops = {
diff --git
a/target/linux/generic/patches-2.6.37/900-slab_maxsize.patch
b/target/linux/generic/patches-2.6.37/900-slab_maxsize.patch
index 83fd6c309928d78bdbdc7db87abdd7b06383d9cd..fe8cecfc771ed7a1cd16d22361475b2151e8bb98 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/900-slab_maxsize.patch
+++ b/
target/linux/generic/patches-2.6.37/900-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.37/911-kobject_add_broadcast_uevent.patch
b/target/linux/generic/patches-2.6.37/911-kobject_add_broadcast_uevent.patch
index b3e4b6e7c75b08e80bb482f2d3e49d7027c8547f..7b36ab61155852435502d646418fe1ff151b1081 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/911-kobject_add_broadcast_uevent.patch
+++ b/
target/linux/generic/patches-2.6.37/911-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)
-@@ -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; }
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.37/941-ocf_20100325.patch
b/target/linux/generic/patches-2.6.37/941-ocf_20100325.patch
index a1c088a9a8d7b102216f74c4d2e6de89aee71dfc..410384c28f0dc6a42f8e8252bf03775f198e82b2 100644
(file)
--- a/
target/linux/generic/patches-2.6.37/941-ocf_20100325.patch
+++ b/
target/linux/generic/patches-2.6.37/941-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