summaryrefslogtreecommitdiff
path: root/target/linux/generic-2.6/patches-2.6.34
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-05-23 13:17:32 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-05-23 13:17:32 +0000
commit3e4f6af8a5cf99e178706b4490a3ab96cdc34362 (patch)
tree9280fa304484f75dbc9faf4e52b99f9e52ef3608 /target/linux/generic-2.6/patches-2.6.34
parentb18a1d217ba9a6516c195339e9f4dde3e0a7f3ce (diff)
downloadmtk-20170518-3e4f6af8a5cf99e178706b4490a3ab96cdc34362.zip
mtk-20170518-3e4f6af8a5cf99e178706b4490a3ab96cdc34362.tar.gz
mtk-20170518-3e4f6af8a5cf99e178706b4490a3ab96cdc34362.tar.bz2
generic-2.6: refresh patches
SVN-Revision: 21542
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.34')
-rw-r--r--target/linux/generic-2.6/patches-2.6.34/020-mips_multi_machine_support.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.34/088-winbond_cmdset.patch8
-rw-r--r--target/linux/generic-2.6/patches-2.6.34/110-netfilter_match_speedup.patch8
-rw-r--r--target/linux/generic-2.6/patches-2.6.34/511-yaffs-cvs-2009-04-24.patch8
-rw-r--r--target/linux/generic-2.6/patches-2.6.34/980-vm_exports.patch2
5 files changed, 14 insertions, 16 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.34/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.34/020-mips_multi_machine_support.patch
index be45200..1d9697b 100644
--- a/target/linux/generic-2.6/patches-2.6.34/020-mips_multi_machine_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/020-mips_multi_machine_support.patch
@@ -137,7 +137,7 @@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -851,6 +851,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
+@@ -853,6 +853,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
config SYNC_R4K
bool
@@ -157,7 +157,7 @@
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
*/
diff --git a/target/linux/generic-2.6/patches-2.6.34/088-winbond_cmdset.patch b/target/linux/generic-2.6/patches-2.6.34/088-winbond_cmdset.patch
index d4e42b0..d5889ce 100644
--- a/target/linux/generic-2.6/patches-2.6.34/088-winbond_cmdset.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/088-winbond_cmdset.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.32.12/drivers/mtd/chips/gen_probe.c
-===================================================================
---- linux-2.6.32.12.orig/drivers/mtd/chips/gen_probe.c 2010-05-03 10:48:00.000000000 +0200
-+++ linux-2.6.32.12/drivers/mtd/chips/gen_probe.c 2010-05-03 10:48:16.000000000 +0200
-@@ -249,6 +249,7 @@
+--- a/drivers/mtd/chips/gen_probe.c
++++ b/drivers/mtd/chips/gen_probe.c
+@@ -249,6 +249,7 @@ static struct mtd_info *check_cmd_set(st
#endif
#ifdef CONFIG_MTD_CFI_AMDSTD
case 0x0002:
diff --git a/target/linux/generic-2.6/patches-2.6.34/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.34/110-netfilter_match_speedup.patch
index 41c487b..8178a22 100644
--- a/target/linux/generic-2.6/patches-2.6.34/110-netfilter_match_speedup.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/110-netfilter_match_speedup.patch
@@ -127,11 +127,10 @@
e = (struct ipt_entry *)(loc_cpu_entry + off);
if (copy_to_user(userptr + off
-@@ -1000,6 +1040,14 @@ copy_entries_to_user(unsigned int total_
- ret = -EFAULT;
+@@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_
goto free_counters;
}
-+
+
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
+ if (copy_to_user(userptr + off
+ + offsetof(struct ipt_entry, ip.flags),
@@ -139,6 +138,7 @@
+ 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.34/511-yaffs-cvs-2009-04-24.patch b/target/linux/generic-2.6/patches-2.6.34/511-yaffs-cvs-2009-04-24.patch
index c334b17..c40da10 100644
--- a/target/linux/generic-2.6/patches-2.6.34/511-yaffs-cvs-2009-04-24.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/511-yaffs-cvs-2009-04-24.patch
@@ -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.34/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.34/980-vm_exports.patch
index 6bb4105..5d0b5c6 100644
--- a/target/linux/generic-2.6/patches-2.6.34/980-vm_exports.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/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
-@@ -4357,6 +4357,7 @@ int can_nice(const struct task_struct *p
+@@ -4367,6 +4367,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}