aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2015-02-07 17:48:33 +0000
committerLuka Perkov <luka@openwrt.org>2015-02-07 17:48:33 +0000
commitd81a8ad5239d2f65683845645fef527e6d39ac2e (patch)
treeb354ff82af5516fbc568d080676db6b141f5c0a3 /target
parent84c6ee610bb8daf1933311ddf0628b8c74cf452f (diff)
downloadupstream-d81a8ad5239d2f65683845645fef527e6d39ac2e.tar.gz
upstream-d81a8ad5239d2f65683845645fef527e6d39ac2e.tar.bz2
upstream-d81a8ad5239d2f65683845645fef527e6d39ac2e.zip
kernel: update 3.14 to 3.14.32
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 44302
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/patches-3.14/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch13
-rw-r--r--target/linux/generic/patches-3.14/902-debloat_proc.patch2
2 files changed, 5 insertions, 10 deletions
diff --git a/target/linux/generic/patches-3.14/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch b/target/linux/generic/patches-3.14/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch
index 3f70225980..1edc99525d 100644
--- a/target/linux/generic/patches-3.14/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch
+++ b/target/linux/generic/patches-3.14/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch
@@ -14,8 +14,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
drivers/mtd/bcm47xxpart.c | 10 ++++++++++
1 file changed, 10 insertions(+)
-diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
-index f14ec0f..40dd0db 100644
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -39,6 +39,7 @@
@@ -26,10 +24,11 @@ index f14ec0f..40dd0db 100644
#define ML_MAGIC1 0x39685a42
#define ML_MAGIC2 0x26594131
#define TRX_MAGIC 0x30524448
-@@ -177,6 +178,15 @@ static int bcm47xxpart_parse(struct mtd_info *master,
+@@ -176,6 +177,15 @@ static int bcm47xxpart_parse(struct mtd_
+ MTD_WRITEABLE);
continue;
}
-
++
+ /* T_Meter */
+ if ((le32_to_cpu(buf[0x000 / 4]) & 0xFFFF0000) == T_METER_MAGIC &&
+ (le32_to_cpu(buf[0x030 / 4]) & 0xFFFF0000) == T_METER_MAGIC &&
@@ -38,10 +37,6 @@ index f14ec0f..40dd0db 100644
+ MTD_WRITEABLE);
+ continue;
+ }
-+
+
/* TRX */
if (buf[0x000 / 4] == TRX_MAGIC) {
- if (BCM47XXPART_MAX_PARTS - curr_part < 4) {
---
-1.8.4.5
-
diff --git a/target/linux/generic/patches-3.14/902-debloat_proc.patch b/target/linux/generic/patches-3.14/902-debloat_proc.patch
index 9024d6401e..55e21a43ba 100644
--- a/target/linux/generic/patches-3.14/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.14/902-debloat_proc.patch
@@ -133,7 +133,7 @@
}
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
-@@ -1302,10 +1302,12 @@ static int __init setup_vmstat(void)
+@@ -1303,10 +1303,12 @@ static int __init setup_vmstat(void)
put_online_cpus();
#endif
#ifdef CONFIG_PROC_FS